Merge branch 'dev_bugfix_ljj' into dev

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

@@ -394,61 +394,61 @@
         </foreach>
     </select>
     <select id="getCheckResult" resultType="com.epmet.dto.screen.result.DataCheckDTO">
-        SELECT
-            CUSTOMER_ID,
+	    SELECT
+            a.CUSTOMER_ID,
             AGENCY_ID AS agencyId,
-            CASE
-                AGENCY_ID
-                WHEN '1258587398679126017' THEN
-                '榆山'
-                WHEN '1215437824174608386' THEN
-                '锦水'
-                WHEN '1234085031077498881' THEN
-                '孔村'
-                WHEN 'f8d4a6af53b3fc5991ab1434b6ad39b8' THEN
-                '东阿镇'
-                WHEN 'f279343a67653fc20d8333c6b2e4dbee' THEN
-                '孝直镇'
-                WHEN 'ea78a8e9252f567517c4a8d60250c714' THEN
-                '安城镇'
-                WHEN 'c259c3b1d27f960b9b379fb2886179ba' THEN
-                '洪范池镇'
-                WHEN 'd20a7488eedf5bcfd5231c3771bc0e3d' THEN
-                '玫瑰镇'
-                ELSE '未知'
-            END AS agencyName,
-            PROJECT_TOTAL AS reportCount,
+        CASE
+            AGENCY_ID
+            WHEN '1258587398679126017' THEN
+            '榆山'
+            WHEN '1215437824174608386' THEN
+            '锦水'
+            WHEN '1234085031077498881' THEN
+            '孔村'
+            WHEN 'f8d4a6af53b3fc5991ab1434b6ad39b8' THEN
+            '东阿镇'
+            WHEN 'f279343a67653fc20d8333c6b2e4dbee' THEN
+            '孝直镇'
+            WHEN 'ea78a8e9252f567517c4a8d60250c714' THEN
+            '安城镇'
+            WHEN 'c259c3b1d27f960b9b379fb2886179ba' THEN
+            '洪范池镇'
+            WHEN 'd20a7488eedf5bcfd5231c3771bc0e3d' THEN
+            '玫瑰镇' ELSE '未知'
+        END AS agencyName,
             DATE_ID,
+            PROJECT_TOTAL AS reportCount,
+            COUNT( b.PROJECT_ID ) AS count
+        FROM
             (
             SELECT
-                count(*) AS dataCount
+                *
             FROM
-                screen_project_data
+                epmet_data_statistical.fact_agency_project_daily
             WHERE
                 1 = 1
-                AND CUSTOMER_ID = a.CUSTOMER_ID
-                AND ALL_PARENT_IDS LIKE CONCAT( '%', a.AGENCY_ID, '%' )
                 AND DEL_FLAG = '0'
-                AND DATE_FORMAT( PROJECT_CREATE_TIME, '%Y%m%d' ) &lt;= DATE_ID
-            GROUP BY
-                AGENCY_ID
-            ORDER BY
-                AGENCY_ID
-            ) AS count
-        FROM
-            epmet_data_statistical.fact_agency_project_daily a
-        WHERE
-            1 = 1
-            AND del_flag = '0'
-            AND customer_id IN ( '2fe0065f70ca0e23ce4c26fca5f1d933', '44876154d10d7cb7affd92000f84f833', '46c55cb862d6d5e6d05d2ab61a1cc07e', '6f203e30de1a65aab7e69c058826cd80' )
-            AND AGENCY_ID IN ( '1234085031077498881', '1215437824174608386', '1258587398679126017', 'c259c3b1d27f960b9b379fb2886179ba', 'd20a7488eedf5bcfd5231c3771bc0e3d', 'ea78a8e9252f567517c4a8d60250c714', 'f279343a67653fc20d8333c6b2e4dbee', 'f8d4a6af53b3fc5991ab1434b6ad39b8' )
-            <if test='null != dateId and "" != dateId'>
-                AND DATE_ID = #{dateId}
-            </if>
-            <if test='null != startDate and "" != startDate and null != endDate and "" != endDate'>
-                AND DATE_ID BETWEEN #{startDate} AND #{endDate}
-            </if>
+                AND CUSTOMER_ID IN ( '2fe0065f70ca0e23ce4c26fca5f1d933', '44876154d10d7cb7affd92000f84f833', '46c55cb862d6d5e6d05d2ab61a1cc07e', '6f203e30de1a65aab7e69c058826cd80' )
+                AND AGENCY_ID IN ( '1234085031077498881', '1215437824174608386', '1258587398679126017', 'c259c3b1d27f960b9b379fb2886179ba', 'd20a7488eedf5bcfd5231c3771bc0e3d', 'ea78a8e9252f567517c4a8d60250c714', 'f279343a67653fc20d8333c6b2e4dbee', 'f8d4a6af53b3fc5991ab1434b6ad39b8' )
+                <if test='null != dateId and "" != dateId'>
+                    AND DATE_ID = #{dateId}
+                </if>
+                <if test='null != startDate and "" != startDate and null != endDate and "" != endDate'>
+                    AND DATE_ID BETWEEN #{startDate} AND #{endDate}
+                </if>
+            ) a
+        LEFT JOIN (
+            SELECT
+                *
+            FROM
+                screen_project_data
+            WHERE
+                DEL_FLAG = '0'
+            AND CUSTOMER_ID IN ( '2fe0065f70ca0e23ce4c26fca5f1d933', '44876154d10d7cb7affd92000f84f833', '46c55cb862d6d5e6d05d2ab61a1cc07e', '6f203e30de1a65aab7e69c058826cd80' )) b ON b.CUSTOMER_ID = a.CUSTOMER_ID
+            AND ALL_PARENT_IDS LIKE CONCAT( '%', a.AGENCY_ID, '%' )
+            AND DATE_FORMAT( PROJECT_CREATE_TIME, '%Y%m%d' ) &lt;= DATE_ID
         GROUP BY
+            CUSTOMER_ID,
             AGENCY_ID,
             DATE_ID
         HAVING
@@ -456,7 +456,7 @@
             AND reportCount != count
         ORDER BY
             AGENCY_ID,
-	        DATE_ID DESC
+            DATE_ID DESC
     </select>
 
     <update id="updateHistoryData">