Merge branch 'feature/screenDataPush'

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 治理能力数据推送
+ * 目前榆山和锦水属于街道，孔村属于区直部门，所以仅有孔村对区直部门做了额外处理
  *
  * @author zhy
  * @date 2021/6/28 11:07

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml

@@ -199,7 +199,8 @@
         )
         AND sd.type_key IN (
             'community_party',
-            'street_party'
+            'street_party',
+            'district_party'
         )
         GROUP BY
             sd.id
@@ -245,7 +246,10 @@
         info.streetClosedCount / info.problemResolvedCount,
         0
         ) AS streetClosedRatio,
-            0 AS districtDeptClosedRatio
+        IFNULL(
+        info.districtClosedCount / info.problemResolvedCount,
+        0
+        ) AS districtDeptClosedRatio
         FROM
         (
         SELECT
@@ -258,7 +262,19 @@
         sd.pids,
         IFNULL(
         (
-                            IFNULL(topic.topicResolvedCount, 0) + IFNULL(topic.topicUnResolvedCount, 0) + IFNULL(issue.issueResolvedCount, 0) + IFNULL(issue.issueUnResolvedCount, 0) + IFNULL(item.issueProjectResolvedCount, 0) + IFNULL(item.issueProjectUnResolvedCount, 0)
+        IFNULL(topic.topicResolvedCount, 0) + IFNULL(
+        topic.topicUnResolvedCount,
+        0
+        ) + IFNULL(issue.issueResolvedCount, 0) + IFNULL(
+        issue.issueUnResolvedCount,
+        0
+        ) + IFNULL(
+        item.issueProjectResolvedCount,
+        0
+        ) + IFNULL(
+        item.issueProjectUnResolvedCount,
+        0
+        )
         ),
         0
         ) AS problemResolvedCount,
@@ -326,7 +342,10 @@
         streetsolved.streetClosedCount,
         0
         ) AS streetClosedCount,
-                    0 AS districtDeptClosedCount
+        IFNULL(
+        districtsolved.districtClosedCount,
+        0
+        ) AS districtClosedCount
         FROM
         esua_epdc_admin.sys_dept sd
         LEFT JOIN (
@@ -492,6 +511,39 @@
         GROUP BY
         t.GRID_ID
         ) streetsolved ON streetsolved.GRID_ID = sd.id
+        LEFT JOIN (
+        SELECT
+        GRID_ID,
+        IFNULL(COUNT(0), 0) AS districtClosedCount
+        FROM
+        (
+        SELECT
+        GRID_ID,
+        eit.id,
+        hp.HANDLER_DEPT_ID,
+        eit.UPDATED_TIME
+        FROM
+        esua_epdc_events.epdc_item eit
+        LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
+        LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID
+        WHERE
+        eit.DEL_FLAG = '0'
+        AND hp.DEL_FLAG = '0'
+        AND eit.ITEM_STATE IN ('5', '10')
+        AND hp.STATE IN ('5', '10')
+        AND sd.type_key = 'district_party'
+        GROUP BY
+        eit.GRID_ID,
+        eit.ID
+        ) t
+        WHERE
+        DATE_FORMAT(t.UPDATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(
+        date_add(now(), INTERVAL - 1 DAY),
+        '%Y-%m-%d'
+        )
+        GROUP BY
+        t.GRID_ID
+        ) districtsolved ON districtsolved.GRID_ID = sd.id
         WHERE
         sd.del_flag = '0'
         AND sd.type_key = 'grid_party'
@@ -520,6 +572,8 @@
         'community'
         WHEN sd.type_key = 'street_party' THEN
         'street'
+        WHEN sd.type_key = 'district_party' THEN
+        'district'
         END AS LEVEL,
         sd.pid,
         sd.pids,
@@ -618,14 +672,29 @@
         sum(info.streetClosedCount) / sum(info.problemResolvedCount),
         0
         ) AS streetClosedRatio,
-         0 AS districtDeptClosedRatio
+        IFNULL(
+        sum(info.districtClosedCount) / sum(info.problemResolvedCount),
+        0
+        ) AS districtDeptClosedRatio
         FROM
         (
         SELECT
         sd.pids,
         IFNULL(
         (
-                            IFNULL(topic.topicResolvedCount, 0) + IFNULL(topic.topicUnResolvedCount, 0) + IFNULL(issue.issueResolvedCount, 0) + IFNULL(issue.issueUnResolvedCount, 0) + IFNULL(item.issueProjectResolvedCount, 0) + IFNULL(item.issueProjectUnResolvedCount, 0)
+        IFNULL(topic.topicResolvedCount, 0) + IFNULL(
+        topic.topicUnResolvedCount,
+        0
+        ) + IFNULL(issue.issueResolvedCount, 0) + IFNULL(
+        issue.issueUnResolvedCount,
+        0
+        ) + IFNULL(
+        item.issueProjectResolvedCount,
+        0
+        ) + IFNULL(
+        item.issueProjectUnResolvedCount,
+        0
+        )
         ),
         0
         ) AS problemResolvedCount,
@@ -693,7 +762,10 @@
         streetsolved.streetClosedCount,
         0
         ) AS streetClosedCount,
-                    0 AS districtDeptClosedCount
+        IFNULL(
+        districtsolved.districtClosedCount,
+        0
+        ) AS districtClosedCount
         FROM
         esua_epdc_admin.sys_dept sd
         LEFT JOIN (
@@ -859,6 +931,39 @@
         GROUP BY
         t.GRID_ID
         ) streetsolved ON streetsolved.GRID_ID = sd.id
+        LEFT JOIN (
+        SELECT
+        GRID_ID,
+        IFNULL(COUNT(0), 0) AS districtClosedCount
+        FROM
+        (
+        SELECT
+        GRID_ID,
+        eit.id,
+        hp.HANDLER_DEPT_ID,
+        eit.UPDATED_TIME
+        FROM
+        esua_epdc_events.epdc_item eit
+        LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
+        LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID
+        WHERE
+        eit.DEL_FLAG = '0'
+        AND hp.DEL_FLAG = '0'
+        AND eit.ITEM_STATE IN ('5', '10')
+        AND hp.STATE IN ('5', '10')
+        AND sd.type_key = 'district_party'
+        GROUP BY
+        eit.GRID_ID,
+        eit.ID
+        ) t
+        WHERE
+        DATE_FORMAT(t.UPDATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(
+        date_add(now(), INTERVAL - 1 DAY),
+        '%Y-%m-%d'
+        )
+        GROUP BY
+        t.GRID_ID
+        ) districtsolved ON districtsolved.GRID_ID = sd.id
         WHERE
         sd.del_flag = '0'
         AND sd.type_key = 'grid_party'
@@ -886,10 +991,10 @@
         )
         AND sd.type_key IN (
             'community_party',
-            'street_party'
+            'street_party',
+            'district_party'
         )
         GROUP BY
         sd.id
     </select>
-
 </mapper>