From d218cc9a842fde39bfdfb46f6ff527cd2e970ce1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 5 Jan 2025 14:01:55 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisCommonToolsController.java   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java
index 1185edc2c..ea97347d7 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java
@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -109,24 +110,33 @@ public class EmisCommonToolsController extends EmisBaseController
             String empName=getLoginUser().getUser().getEmpName();
             EmisCommissionProfit emisCommissionProfit = new EmisCommissionProfit();
             emisCommissionProfit.setEmpName(empName);
-            emisCommissionProfit.setBillMonth(billMonth);
+//            emisCommissionProfit.setBillMonth(billMonth);
             List<EmisCommissionProfit> listProfit= emisCommissionProfitService.selectEmisCommissionProfitList(emisCommissionProfit);
-
+            BigDecimal estMoneyMoney = BigDecimal.ZERO;
             if(!CollectionUtils.isEmpty(listProfit)){
-                EmisCommissionProfit item0=listProfit.get(0);
-                commissionStatMap.put("estMoney",item0.getMoney().stripTrailingZeros().toPlainString());
+                for (EmisCommissionProfit item:listProfit) {
+                    estMoneyMoney=estMoneyMoney.add(item.getMoney());
+                }
             }
 
+            commissionStatMap.put("estMoney",estMoneyMoney.stripTrailingZeros().toPlainString());
+
+
             // 待回款
             EmisSettleBill emisSettleBill=new EmisSettleBill();
             emisSettleBill.getParams().put("isNeedRecdPay",1);
             emisSettleBill.setSalesmen(empName);
-            emisSettleBill.setBillMonth(billMonth);
+//            emisSettleBill.setBillMonth(billMonth);
             List<BillPayStatInfo> listExpireNoPayStatInfo = emisSettleBillService.selectBillPayStatInfoList(emisSettleBill);
+            BigDecimal waitPayMoney = BigDecimal.ZERO;
             if(!CollectionUtils.isEmpty(listExpireNoPayStatInfo)){
-                BillPayStatInfo item0=listExpireNoPayStatInfo.get(0);
-                commissionStatMap.put("waitPay",item0.getNoRecdPayMoney().stripTrailingZeros().toPlainString());
+                for (BillPayStatInfo item:listExpireNoPayStatInfo) {
+                    waitPayMoney=waitPayMoney.add(item.getNoRecdPayMoney());
+                }
+
             }
+            commissionStatMap.put("waitPay",waitPayMoney.stripTrailingZeros().toPlainString());
+
 
             statMap.put("commStat",commissionStatMap);