事件分析组织-月 统计 微调

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java

@@ -169,16 +169,16 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
         List<ProjectOrgMonthlyResultDTO> projectOrg = baseDao.selectQuantityOrgMonthly(agencyInfos, monthId);
         if (!CollectionUtils.isEmpty(projectOrg)){
             projectOrg.forEach(p -> {
-                p.setClosedIncr(null == p.getClosedIncr() ? NumConstant.ZERO : p.getClosedIncr());
-                p.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr());
+                p.setClosedIncr(p.getClosedIncr());
+                p.setProjectIncr(p.getProjectIncr());
             });
         }
         List<ProjectOrgMonthlyResultDTO> projectGrandOrg = baseDao.selectQuantityGrandOrgMonthly(agencyInfos, monthId);
         if (!CollectionUtils.isEmpty(projectGrandOrg)){
             projectGrandOrg.forEach(p -> {
-                p.setClosedTotal(null == p.getClosedTotal() ? NumConstant.ZERO : p.getClosedTotal());
-                p.setProjectTotal(null == p.getProjectTotal() ? NumConstant.ZERO : p.getProjectTotal());
-                p.setUnClosedTotal(null == p.getUnClosedTotal() ? NumConstant.ZERO : p.getUnClosedTotal());
+                p.setClosedTotal(p.getClosedTotal());
+                p.setProjectTotal(p.getProjectTotal());
+                p.setUnClosedTotal(p.getUnClosedTotal());
             });
         }
         agencyInfos.forEach(a -> {

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectQuantityOrgMonthlyDao.xml

@@ -101,8 +101,8 @@
         <foreach collection="agencyInfos" item="a" separator=" UNION ">
             SELECT
             #{a.areaCode} AS areaCode,
-            SUM(g.PROJECT_INCR) AS projectIncr,
-            SUM(g.CLOSED_INCR) AS closedIncr
+            IFNULL(SUM(g.PROJECT_INCR),0) AS projectIncr,
+            IFNULL(SUM(g.CLOSED_INCR),0) AS closedIncr
             FROM screen_project_quantity_grid_monthly g
             LEFT JOIN screen_customer_grid cg ON cg.GRID_ID = g.GRID_ID
             WHERE g.DEL_FLAG = 0
@@ -116,9 +116,9 @@
         <foreach collection="agencyInfos" item="a" separator=" UNION ">
             SELECT
             #{a.areaCode} AS areaCode,
-            SUM(g.PROJECT_TOTAL) AS projectTotal,
-            SUM(g.UN_CLOSED_TOTAL) AS unClosedTotal,
-            SUM(g.CLOSED_TOTAL) AS closedTotal
+            IFNULL(SUM(g.PROJECT_TOTAL),0) AS projectTotal,
+            IFNULL(SUM(g.UN_CLOSED_TOTAL),0) AS unClosedTotal,
+            IFNULL(SUM(g.CLOSED_TOTAL),0) AS closedTotal
             FROM screen_project_quantity_grid_monthly g
             LEFT JOIN screen_customer_grid cg ON cg.GRID_ID = g.GRID_ID
             WHERE g.DEL_FLAG = 0