소스 검색

客户收支表更新

liuyao 1 년 전
부모
커밋
91544ffb87
1개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. 5 2
      src/main/java/com/dk/mdm/service/report/ReportService.java

+ 5 - 2
src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -852,10 +852,13 @@ public class ReportService {
             // 获取收支额
             Map<String, Object> incomeExpenditure = reportMapper.getIncomeExpenditure(params);
             // 获取欠款额
-            Map<String, Object> debt = reportMapper.getDebt(params);
+//            Map<String, Object> debt = reportMapper.getDebt(params);
+            Map<String, Object> debt = new HashMap<>();
             if (debt != null) {
+//                debt.put("outAmt", Double.valueOf(String.valueOf(sales.get("facAmt")).equals("null") ? "0" : String.valueOf(sales.get("facAmt")))
+//                        + Double.valueOf(String.valueOf(debt.get("outAmt")).equals("null") ? "0" : String.valueOf(debt.get("outAmt")))
+//                        - Double.valueOf(String.valueOf(incomeExpenditure.get("arrears")).equals("null") ? "0" : String.valueOf(incomeExpenditure.get("arrears"))));
                 debt.put("outAmt", Double.valueOf(String.valueOf(sales.get("facAmt")).equals("null") ? "0" : String.valueOf(sales.get("facAmt")))
-                        + Double.valueOf(String.valueOf(debt.get("outAmt")).equals("null") ? "0" : String.valueOf(debt.get("outAmt")))
                         - Double.valueOf(String.valueOf(incomeExpenditure.get("arrears")).equals("null") ? "0" : String.valueOf(incomeExpenditure.get("arrears"))));
             }
             List<Map<String, Object>> overviewList = new ArrayList<>();