diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectScore.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectScore.java index 6caf029..80037ec 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectScore.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectScore.java @@ -38,13 +38,13 @@ public class ProjectScore implements Serializable { /** * 红旗数量 */ - @ExcelIgnore + @ExcelProperty(value = "红旗数量") private String redFlagCount; /** * 评分细则 */ - @ExcelIgnore + @ExcelProperty(value = "评分细则") private String detail; @TableField(exist = false) diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java index 90c1022..f6afce1 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java @@ -56,4 +56,6 @@ public interface IHuzhouContractinfoService extends IService Boolean checkContractAmount(List contractList, String contractMoneyFieldsValue, String taskName) throws JsonProcessingException; ContractPayInfoDTO queryContractPaySituation(HuzhouProjectinfo projectInfo); + + HuzhouContractinfo getContractInfoByProjectId(String projectId); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java index 7169d7f..01f631c 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java @@ -592,6 +592,40 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl realContractInfoList = contractinfoService.getRealContractinfoByprojectId(projectId); + + // 初始化累加器 + Double totalMoneySum = 0.0; + Double centralMoneySum = 0.0; + Double provincialMoneySum = 0.0; + Double cityMoneySum = 0.0; + Double countyMoneySum = 0.0; + Double selfMoneySum = 0.0; + + // 遍历列表,进行累加 + for (HuzhouContractinfo contractinfo : realContractInfoList) { + totalMoneySum += contractinfo.getTotalMoney() == null ? 0 : contractinfo.getTotalMoney(); + centralMoneySum += contractinfo.getCentralMoney() == null ? 0 : contractinfo.getCentralMoney(); + provincialMoneySum += contractinfo.getProvincialMoney() == null ? 0 : contractinfo.getProvincialMoney(); + cityMoneySum += contractinfo.getCityMoney() == null ? 0 : contractinfo.getCityMoney(); + countyMoneySum += contractinfo.getCountyMoney() == null ? 0 : contractinfo.getCountyMoney(); + selfMoneySum += contractinfo.getSelfMoney() == null ? 0 : contractinfo.getSelfMoney(); + log.info("totalMoneySum:{}--->centralMoneySum:{}", totalMoneySum, centralMoneySum); + } + + // 封装到新的对象中 + HuzhouContractinfo huzhouContractinfo = new HuzhouContractinfo(); + huzhouContractinfo.setTotalMoney(totalMoneySum); + huzhouContractinfo.setCentralMoney(centralMoneySum); + huzhouContractinfo.setProvincialMoney(provincialMoneySum); + huzhouContractinfo.setCityMoney(cityMoneySum); + huzhouContractinfo.setCountyMoney(countyMoneySum); + huzhouContractinfo.setSelfMoney(selfMoneySum); + + return huzhouContractinfo; + } }