From 59284caa8cb4726fadc07bf5d9e62c9d6288a64d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 30 Aug 2023 15:31:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=89=93=E5=8C=85=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4-=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=80=BB=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayPackCompanyProjectController.java      | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java
index 4381f5ca..4c04ca44 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java
@@ -26,6 +26,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -40,10 +41,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
  /**
@@ -110,8 +108,10 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 		 input.setCompanyId(payPackCompany.getCompanyId());
 		 input.setPackYear(payPackCompany.getPackYear());
 		 List<PayCommonProject> list = payPackCompanyProjectService.queryListAll(input);
+		 BigDecimal sumOfReceivableAmount = BigDecimal.ZERO;
+		 BigDecimal sumOfPaidAmount = BigDecimal.ZERO;
 		 if(!CollectionUtils.isEmpty(list)){
-			 list.forEach(p->{
+			 for (PayCommonProject p : list) {
 				if(!StringUtils.isBlank(p.getPhone())){
 					p.setPhone(PasswordUtil.decrypt(p.getPhone()));
 				}
@@ -124,9 +124,15 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
 				if(Objects.isNull(p.getPaidAmount())){
 					p.setPaidAmount(new BigDecimal("0.00"));
 				}
-			 });
+				sumOfReceivableAmount =  sumOfReceivableAmount.add(p.getReceivableAmount());
+				sumOfPaidAmount =  sumOfPaidAmount.add(p.getPaidAmount());
+			 }
 		 }
-		 return Result.OK(list);
+		 HashMap<String, Object> hashMap = new HashMap<>();
+		 hashMap.put("sumOfReceivableAmount",  sumOfReceivableAmount);
+		 hashMap.put("sumOfPaidAmount",  sumOfPaidAmount);
+		 hashMap.put("list", list);
+		 return Result.OK(hashMap);
 	 }