diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java index a5c1194..fbf26a3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java @@ -83,7 +83,7 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { } } - private List addProjectMonthCosts(List list, CalMonthlyBean record) { + private void addProjectMonthCosts(List list, CalMonthlyBean record) { List leaseList = new ArrayList<>(); calMonthlyMapper.insertCalcRecord(record); String taskId = record.getId(); @@ -112,7 +112,8 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { agreementInfo.setIds(sltAgreementInfo.getIds()); sltAgreementInfo.setMonth(bean.getMonth()); agreementInfo.setEndTime(sltAgreementInfo.getOffTime()); - List leaseListOneMonth = addProjectMonthDetail(agreementInfo, sltAgreementInfo, pmcId); + // 新增project_month_detail + addProjectMonthDetail(agreementInfo, sltAgreementInfo, pmcId); projectMonthCosts.setCosts(sltAgreementInfo.getCosts()); calMonthlyMapper.updateProMonCosts(projectMonthCosts); @@ -129,14 +130,11 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { for (String proMonthCostId : proMonthCostIds) { calMonthlyMapper.deleteDetailsByProMonthCostId(proMonthCostId); } - break; } - sltAgreementInfo.setNode(leaseListOneMonth); + break; } - leaseList.addAll(monthList); } } - return leaseList; }