Przeglądaj źródła

借支列表显示BUG修复

anderx 2 lat temu
rodzic
commit
0d69f21f48

+ 2 - 2
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -191,13 +191,13 @@ public class ExpenseAccountController extends CertifyApiController {
      * @return
      */
     @RequestMapping(value = "/selectDebitOrder",method = RequestMethod.GET)
-    public Result selectDebitOrder(String depId){
+    public Result selectDebitOrder(String depId,Integer id){
         Result res=new Result();
         if (depId==null){
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"抵扣部门"));
             return  res;
         }
-        res.setData(expenseAccountService.selectDebitOrder(depId));
+        res.setData(expenseAccountService.selectDebitOrder(depId,id));
         return res;
     }
 

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

@@ -29,7 +29,7 @@ public interface ExpenseAccountService {
 
     Object updateType(InputExpenseAccount in);
 
-    List<OutExpenseAccount> selectDebitOrder(String depId);
+    List<OutExpenseAccount> selectDebitOrder(String depId,Integer id);
 
     List<OutExpenseAccountStatistics> statistics(String name,String depId,String startTime,String endTime);
 

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

@@ -619,9 +619,20 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     }
 
     @Override
-    public List<OutExpenseAccount> selectDebitOrder(String depId) {
+    public List<OutExpenseAccount> selectDebitOrder(String depId,Integer id) {
         String aid= TokenManager.getAdminId();
-        return expenseAccountMapper.selectByaidAndType(aid,depId,4);
+        List<OutExpenseAccount> list = expenseAccountMapper.selectByaidAndType(aid, depId, 4);
+        for (OutExpenseAccount e : list) {
+            BigDecimal count=new BigDecimal(0);
+            List<ExpenseAccount> list1 = expenseAccountMapper.selectByDebitId(e.getId());
+            for (ExpenseAccount e1 : list1) {
+                if (e1.getId()!=id){
+                    count=count.add(e1.getSettlementAmount());
+                }
+            }
+            e.setSettlementAmount(count);
+        }
+        return list;
     }