Browse Source

新增删除抵扣接口

anderx 2 years ago
parent
commit
49f7f33579

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

@@ -634,7 +634,7 @@
         order by a.create_time desc
     </select>
   <select id="selectStatistics" resultType="com.goafanti.expenseAccount.bo.OutMyEAStatistics">
-    select a.aid,a.aname ,a.type,a.status ,a.total_amount totalAmount ,ifnull(a.debit_id,0) debitId ,a.target_type targetType ,ifnull(a2.total_amount,0) bxdkAmount
+    select a.aid,a.aname ,a.type,a.status ,a.amount totalAmount ,ifnull(a.debit_id,0) debitId ,a.target_type targetType ,ifnull(a2.amount,0) bxdkAmount
     from expense_account a
     left join expense_account a2 on a.debit_id =a2.id left join admin ad on a.aid=ad.id
     where 1=1 and a.expense_main=0

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

@@ -1069,7 +1069,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     out.setBxddAmount(e.getTotalAmount());
                 }
 
-            } else if (e.getStatus() < 2) {
+            } else if (e.getStatus() == 1) {
                 out.setWshs(1);
             } else if (e.getStatus() == 3) {
                 out.setBhs(1);