Browse Source

统计列表修改

anderx 2 years ago
parent
commit
53e17e7800

+ 1 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -474,7 +474,7 @@
     </select>
   <select id="selectStatistics" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountStatistics">
     select a.aid,a.aname ,if(a.`type` &lt;4 ,1,0)bx,if(a.`type`=4 ,1,0)jz,if(a.`type`=5 ,1,0)dk,a.debit_id debitId ,a.target_type targetType ,
-    if(a.`type`&lt; 4 ,a.total_amount ,0)bxAmout,if(a.`type`=4 ,a.total_amount ,0)jzAmount,if(a.`type`=5,a.total_amount,0)dkAmount,
+    if(a.`type`&lt; 4 ,a.total_amount ,0)bxAmount,if(a.`type`=4 ,a.total_amount ,0)jzAmount,if(a.`type`=5,a.total_amount,0)dkAmount,
     if(a.status&lt; 2,1,0)wshs,if(a.status=3,1,0)bhs
     from expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
     left join expense_account_private d on a.eaaid=d.id left join t_order_new o on a.order_no =o.order_no

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

@@ -601,7 +601,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             List<OutExpenseAccountStatistics> list3 = (List<OutExpenseAccountStatistics>) map.get(s);
             if (!list3.isEmpty()){
                 OutExpenseAccountStatistics out =new OutExpenseAccountStatistics(s);
-
+            
                 for (OutExpenseAccountStatistics e : list3) {
                     if (out.getAname()==null)out.setAname(e.getAname());
                     if (e.getBx()!=null)out.setBx(out.getBx()+e.getBx());