微调

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

@@ -82,7 +82,7 @@ public class ScreenProjectCategoryGridAndOrgDailyServiceImpl implements ScreenPr
             closedList = screenProjectDataDao.selectGridCategoryProjectCount(customerIds, dateId, ProjectConstant.PROJECT_STATUS_CLOSED,customerId, NumConstant.TWO);
         }
         List<GridAndOrgCategoryCountResultDTO> finalClosedList = closedList;
-        allList.forEach(a -> finalClosedList.stream().filter(c -> c.getOrgId().equals(a.getOrgId()) && c.getCategoryCode().equals(a.getCategoryCode())).forEach(c -> a.setClosedProjectTotal(c.getClosedProjectTotal())));
+        allList.forEach(a -> finalClosedList.stream().filter(c -> c.getGridId().equals(a.getGridId()) && c.getCategoryCode().equals(a.getCategoryCode())).forEach(c -> a.setClosedProjectTotal(c.getClosedProjectTotal())));
         gridDel(customerId,dateId);
         gridInsert(allList);
     }

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

@@ -316,7 +316,7 @@
                 COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
             </if>
         FROM screen_project_data pd
-        LEFT JOIN screen_project_category pc ON (pc.PROJECT_ID = pd.PROJECT_ID AND pc.DEL_FLAG = '0')
+        INNER JOIN screen_project_category pc ON (pc.PROJECT_ID = pd.PROJECT_ID AND pc.DEL_FLAG = '0')
             WHERE pd.DEL_FLAG = '0'
             AND pd.CUSTOMER_ID IN
             <foreach collection="customerIds" item="c" separator="," open="(" close=")">
@@ -375,7 +375,7 @@
                     COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
                 </if>
             FROM screen_project_data pd
-            LEFT JOIN screen_project_category pc ON (pc.PROJECT_ID = pd.PROJECT_ID AND pc.DEL_FLAG = '0')
+            INNER JOIN screen_project_category pc ON (pc.PROJECT_ID = pd.PROJECT_ID AND pc.DEL_FLAG = '0')
             WHERE pd.DEL_FLAG = '0'
             AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
             AND ALL_PARENT_IDS LIKE #{a.orgId}