diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java index b03f7f65b8..d18f3b6234 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java @@ -253,38 +253,37 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl< List agencyInfos = ConvertUtils.sourceToTarget(screenProjectOrgDailyDTOS, ScreenProjectQuantityOrgMonthlyDTO.class); List projectOrg = baseDao.selectQuantityOrgMonthly(agencyInfos, monthId); - if (!CollectionUtils.isEmpty(projectOrg)){ + /*if (!CollectionUtils.isEmpty(projectOrg)){ projectOrg.forEach(p -> { p.setClosedIncr(p.getClosedIncr()); p.setProjectIncr(p.getProjectIncr()); }); - } + }*/ List projectGrandOrg = baseDao.selectQuantityGrandOrgMonthly(agencyInfos, monthId); - if (!CollectionUtils.isEmpty(projectGrandOrg)){ + /*if (!CollectionUtils.isEmpty(projectGrandOrg)){ projectGrandOrg.forEach(p -> { p.setClosedTotal(p.getClosedTotal()); p.setProjectTotal(p.getProjectTotal()); p.setUnClosedTotal(p.getUnClosedTotal()); }); - } + }*/ agencyInfos.forEach(a -> { a.setMonthId(monthId); if (!CollectionUtils.isEmpty(projectOrg)){ projectOrg.forEach(p -> { if (a.getAreaCode().equals(p.getAreaCode())){ - a.setClosedIncr(null == p.getClosedIncr() ? NumConstant.ZERO : p.getClosedIncr()); - a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr()); - a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr()); + a.setClosedIncr(null == p.getClosedIncr() ? a.getClosedIncr() : a.getClosedIncr() + p.getClosedIncr()); + a.setProjectIncr(null == p.getProjectIncr() ? a.getProjectIncr() : a.getProjectIncr() + p.getProjectIncr()); } }); } if (!CollectionUtils.isEmpty(projectGrandOrg)){ projectGrandOrg.forEach(p -> { if (a.getAreaCode().equals(p.getAreaCode())){ - a.setClosedTotal(null == p.getClosedTotal() ? NumConstant.ZERO : p.getClosedTotal()); - a.setProjectTotal(null == p.getProjectTotal() ? NumConstant.ZERO : p.getProjectTotal()); - a.setUnClosedTotal(null == p.getUnClosedTotal() ? NumConstant.ZERO : p.getUnClosedTotal()); - a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr()); + a.setClosedTotal(null == p.getClosedTotal() ? a.getClosedTotal() : a.getClosedTotal() + p.getClosedTotal()); + a.setProjectTotal(null == p.getProjectTotal() ? a.getProjectTotal() : a.getProjectTotal() + p.getProjectTotal()); + a.setUnClosedTotal(null == p.getUnClosedTotal() ? a.getUnClosedTotal() : a.getUnClosedTotal() + p.getUnClosedTotal()); + a.setProjectIncr(null == p.getProjectIncr() ? a.getProjectIncr() : a.getProjectIncr() + p.getProjectIncr()); } }); }