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 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 hashMap = new HashMap<>(); + hashMap.put("sumOfReceivableAmount", sumOfReceivableAmount); + hashMap.put("sumOfPaidAmount", sumOfPaidAmount); + hashMap.put("list", list); + return Result.OK(hashMap); }