ソースを参照

统计列表修改

anderx 2 年 前
コミット
24435de95a

+ 6 - 6
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountStatistics.java

@@ -29,7 +29,7 @@ public class OutExpenseAccountStatistics {
     /**
      * 报销金额
      */
-    private BigDecimal bxAmout;
+    private BigDecimal bxAmount;
     /**
      * 借支金额
      */
@@ -66,7 +66,7 @@ public class OutExpenseAccountStatistics {
         this.bx=0;
         this.jz=0;
         this.dk=0;
-        this.bxAmout=new BigDecimal(0);
+        this.bxAmount=new BigDecimal(0);
         this.jzAmount=new BigDecimal(0);
         this.dkAmount=new BigDecimal(0);
         this.TotalAmount=new BigDecimal(0);
@@ -157,12 +157,12 @@ public class OutExpenseAccountStatistics {
         this.targetType = targetType;
     }
 
-    public BigDecimal getBxAmout() {
-        return bxAmout;
+    public BigDecimal getBxAmount() {
+        return bxAmount;
     }
 
-    public void setBxAmout(BigDecimal bxAmout) {
-        this.bxAmout = bxAmout;
+    public void setBxAmount(BigDecimal bxAmount) {
+        this.bxAmount = bxAmount;
     }
 
     public BigDecimal getJzAmount() {

+ 5 - 5
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -579,12 +579,12 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             if (e.getBx()==1){
                 if (e.getDebitId()!=null){
                     e.setDk(1);
-                    e.setDkAmount(e.getBxAmout());
+                    e.setDkAmount(e.getBxAmount());
                 }
                 if (e.getTargetType()==0){
-                    e.setGdfyAmount(e.getBxAmout());
+                    e.setGdfyAmount(e.getBxAmount());
                 }else if (e.getTargetType()==1){
-                    e.setBxddAmount(e.getBxAmout());
+                    e.setBxddAmount(e.getBxAmount());
                 }
             }
             //如果不存在就新增
@@ -607,7 +607,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     if (e.getBx()!=null)out.setBx(out.getBx()+e.getBx());
                     if (e.getJz()!=null)out.setJz(out.getJz()+e.getJz());
                     if (e.getDk()!=null)out.setDk(out.getDk()+e.getDk());
-                    if (e.getBxAmout()!=null)out.setBxAmout(out.getBxAmout().add(e.getBxAmout()));
+                    if (e.getBxAmount()!=null)out.setBxAmount(out.getBxAmount().add(e.getBxAmount()));
                     if (e.getJzAmount()!=null)out.setJzAmount(out.getJzAmount().add(e.getJzAmount()));
                     if (e.getDkAmount()!=null)out.setDkAmount(out.getDkAmount().add(e.getDkAmount()));
                     if (e.getGdfyAmount()!=null)out.setGdfyAmount(out.getGdfyAmount().add(e.getGdfyAmount()));
@@ -616,7 +616,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     if (e.getBhs()!=null)out.setBhs(out.getBhs()+e.getBhs());
                 }
                 BigDecimal totalAmount=new BigDecimal(0);
-                totalAmount=totalAmount.add(out.getBxAmout()).add(out.getJzAmount()).subtract(out.getDkAmount());
+                totalAmount=totalAmount.add(out.getBxAmount()).add(out.getJzAmount()).subtract(out.getDkAmount());
                 out.setTotalAmount(totalAmount);
                 results.add(out);
             }