Merge remote-tracking branch 'origin/dev'

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

@@ -287,7 +287,7 @@
                 COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
             </if>
         FROM screen_project_data pd
-        inner 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' AND pc.CATEGORY_CODE IS NOT NULL)
         WHERE pd.DEL_FLAG = '0'
             AND pd.CUSTOMER_ID =#{customerId}
             AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
@@ -313,7 +313,7 @@
                 COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
             </if>
         FROM screen_project_data pd
-        INNER 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' AND pc.CATEGORY_CODE IS NOT NULL)
             WHERE pd.DEL_FLAG = '0'
             AND pd.CUSTOMER_ID = #{customerId}
             AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
@@ -344,7 +344,7 @@
                     COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
                 </if>
             FROM screen_project_data pd
-            inner 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' AND pc.CATEGORY_CODE IS NOT NULL)
             WHERE pd.DEL_FLAG = '0'
                 AND pc.level = 2
                 AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
@@ -375,7 +375,7 @@
                     COUNT(DISTINCT pc.PROJECT_ID) AS projectTotal
                 </if>
             FROM screen_project_data pd
-            INNER 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' AND pc.CATEGORY_CODE IS NOT NULL)
             WHERE pd.DEL_FLAG = '0'
                 AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
                 AND ALL_PARENT_IDS LIKE CONCAT('%',#{a.orgId},'%')