diff --git a/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/application/command/projectPlan/ProjectPlanSvrImpl.java b/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/application/command/projectPlan/ProjectPlanSvrImpl.java index 36c72ca3d53f436a72e659152ef449b9eec5f95b..9ad375a964969e947830a0023f1dcc5fe052cf2b 100644 --- a/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/application/command/projectPlan/ProjectPlanSvrImpl.java +++ b/ServiceSite/src/main/java/com/seasky/dbprojectplanmanage/application/command/projectPlan/ProjectPlanSvrImpl.java @@ -140,30 +140,33 @@ public class ProjectPlanSvrImpl implements IProjectPlanSvr { BigDecimal sonPlanMoney = new BigDecimal(0); BigDecimal aggPlanMoney = new BigDecimal(0); - for (SubProjectInfoCmd subProjectInfoCmd : projectPlanCmd.getSubProjectInfoCmdList()) { - if (ObjectUtil.isNotEmpty(subProjectInfoCmd.getId())) { - longs.add(subProjectInfoCmd.getId()); - } - - ProjectPlanAgg projectPlanAgg = iProjectPlanRepository.queryProjectPlan(aLong); + if (!ObjectUtils.isEmpty(projectPlanCmd.getSubProjectInfoCmdList())) { + for (SubProjectInfoCmd subProjectInfoCmd : projectPlanCmd.getSubProjectInfoCmdList()) { + if (ObjectUtil.isNotEmpty(subProjectInfoCmd.getId())) { + longs.add(subProjectInfoCmd.getId()); + } + + ProjectPlanAgg projectPlanAgg = iProjectPlanRepository.queryProjectPlan(aLong); + + ProjectPlanAgg sonProjectPlanAgg = new ProjectPlanAgg( + projectPlanAgg.getYear(), + subProjectInfoCmd.getProjectName(), + subProjectInfoCmd.getPlanMoney(), + projectPlanAgg.getDepartmentName(), + projectPlanAgg.getDepartmentCode(), + subProjectInfoCmd.getOwnerCode(), + subProjectInfoCmd.getOwnerName(), + aLong, + subProjectInfoCmd.getCreator() - ProjectPlanAgg sonProjectPlanAgg = new ProjectPlanAgg( - projectPlanAgg.getYear(), - subProjectInfoCmd.getProjectName(), - subProjectInfoCmd.getPlanMoney(), - projectPlanAgg.getDepartmentName(), - projectPlanAgg.getDepartmentCode(), - subProjectInfoCmd.getOwnerCode(), - subProjectInfoCmd.getOwnerName(), - aLong, - subProjectInfoCmd.getCreator() - - ); - sonPlanMoney = sonPlanMoney.add(sonProjectPlanAgg.getPlanMoney()); - aggPlanMoney = projectPlanAgg.getPlanMoney(); - iProjectPlanRepository.saveSonProjectPlan(sonProjectPlanAgg); + ); + sonPlanMoney = sonPlanMoney.add(sonProjectPlanAgg.getPlanMoney()); + aggPlanMoney = projectPlanAgg.getPlanMoney(); + iProjectPlanRepository.saveSonProjectPlan(sonProjectPlanAgg); + } } + if ((sonPlanMoney.compareTo(aggPlanMoney) > 0)) { throw new DataAccessException( Error.builder()