diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyGovernDailyResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyGovernDailyResultDTO.java
index 42237e2f..4c9c2b01 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyGovernDailyResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenAgencyGovernDailyResultDTO.java
@@ -120,7 +120,7 @@ public class ScreenAgencyGovernDailyResultDTO implements Serializable {
     private Integer inGroupTopicUnResolvedCount;
 
     /**
-     * 11、未出当前组织的，结案项目数
+     * （改）13、当前组织内结案的项目中：由网格结案的项目总数
      */
     private Integer gridSelfGovernProjectTotal;
 
@@ -135,7 +135,17 @@ public class ScreenAgencyGovernDailyResultDTO implements Serializable {
     private Integer streetClosedCount;
 
     /**
-     * 当前组织内出来的项目：由区直部门(已解决+未解决)结案的项目总数
+     * （改）16、当前组织内结案的项目中：由区直部门结案的项目总数
      */
     private Integer districtDeptClosedCount;
+
+    /**
+     * （新增）11、当前组织内：来源于事件的项目：结案已解决数
+     */
+    private Integer eventResolvedCount;
+
+    /**
+     * （新增）12、当前组织内：来源于事件的项目：结案无需解决数
+     */
+    private Integer eventUnResolvedCount;
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridGovernDailyResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridGovernDailyResultDTO.java
index ecb248c7..44b85f2b 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridGovernDailyResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGridGovernDailyResultDTO.java
@@ -135,7 +135,7 @@ public class ScreenGridGovernDailyResultDTO implements Serializable {
     private Integer fromAgencyUnResolvedInGridCount;
 
     /**
-     * 15、未出当前网格的，结案项目数=11+12+13+14
+     * （改）17、当前网格内出来的项目：由网格结案(已解决+未解决)的项目总数
      */
     private Integer gridSelfGovernProjectTotal;
 
@@ -153,4 +153,14 @@ public class ScreenGridGovernDailyResultDTO implements Serializable {
      * 当前网格内出来的项目：由区直部门(已解决+未解决)结案的项目总数
      */
     private Integer districtDeptClosedCount;
+
+    /**
+     * （新）15、当前网格内：来源于事件的项目：结案已解决数
+     */
+    private Integer eventResolvedCount;
+
+    /**
+     * （新）16、当前网格内：来源于事件的项目：结案无需解决数
+     */
+    private Integer eventUnResolvedCount;
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml
index 0d2f3243..cce0109b 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGovernanceDao.xml
@@ -263,774 +263,535 @@
     </select>
 
     <select id="gridgoverndaily" resultType="com.elink.esua.epdc.dto.screen.result.ScreenGridGovernDailyResultDTO">
-        SELECT
-        info.*, IFNULL(
-        (
-        info.inGroupTopicResolvedCount + info.inGroupTopicUnResolvedCount
-        ) / info.problemResolvedCount,
-        0
-        ) AS groupSelfGovernRatio,
-        IFNULL(
-        info.gridSelfGovernProjectTotal / info.problemResolvedCount,
-        0
-        ) AS gridSelfGovernRatio,
-        IFNULL(
-        info.communityClosedCount / info.problemResolvedCount,
-        0
-        ) AS communityClosedRatio,
-        IFNULL(
-        info.streetClosedCount / info.problemResolvedCount,
-        0
-        ) AS streetClosedRatio,
-        IFNULL(
-        info.districtClosedCount / info.problemResolvedCount,
-        0
-        ) AS districtDeptClosedRatio
-        FROM
-        (
-        SELECT
-        DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y%m%d'
-        ) AS dateId,
-        sd.id AS gridId,
-        sd.pid,
-        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
-        )
-        ),
-        0
-        ) AS problemResolvedCount,
-        IFNULL(topic.topicResolvedCount, 0) AS topicResolvedCount,
-        IFNULL(
-        topic.topicUnResolvedCount,
-        0
-        ) AS topicUnResolvedCount,
-        IFNULL(issue.issueResolvedCount, 0) AS issueResolvedCount,
-        IFNULL(
-        issue.issueUnResolvedCount,
-        0
-        ) AS issueUnResolvedCount,
-        IFNULL(
-        item.issueProjectResolvedCount,
-        0
-        ) AS issueProjectResolvedCount,
-        IFNULL(
-        item.issueProjectUnResolvedCount,
-        0
-        ) AS issueProjectUnResolvedCount,
-        IFNULL(
-        item.approvalProjectResolvedCount,
-        0
-        ) AS approvalProjectResolvedCount,
-        IFNULL(
-        item.approvalProjectUnResolvedCount,
-        0
-        ) AS approvalProjectUnResolvedCount,
-        IFNULL(
-        topic.inGroupTopicResolvedCount,
-        0
-        ) AS inGroupTopicResolvedCount,
-        IFNULL(
-        topic.inGroupTopicUnResolvedCount,
-        0
-        ) AS inGroupTopicUnResolvedCount,
-        IFNULL(
-        selfsolved.fromIssueResolvedInGridCount,
-        0
-        ) AS fromIssueResolvedInGridCount,
-        IFNULL(
-        selfsolved.fromIssueUnResolvedInGridCount,
-        0
-        ) AS fromIssueUnResolvedInGridCount,
-        IFNULL(
-        selfsolved.fromAgencyResolvedInGridCount,
-        0
-        ) AS fromAgencyResolvedInGridCount,
-        IFNULL(
-        selfsolved.fromAgencyUnResolvedInGridCount,
-        0
-        ) AS fromAgencyUnResolvedInGridCount,
-        IFNULL(
-        (
-        selfsolved.fromIssueResolvedInGridCount + selfsolved.fromIssueUnResolvedInGridCount + selfsolved.fromIssueUnResolvedInGridCount + selfsolved.fromAgencyResolvedInGridCount
-        ),
-        0
-        ) AS gridSelfGovernProjectTotal,
-        IFNULL(
-        commsolved.communityClosedCount,
-        0
-        ) AS communityClosedCount,
-        IFNULL(
-        streetsolved.streetClosedCount,
-        0
-        ) AS streetClosedCount,
-        IFNULL(
-        districtsolved.districtClosedCount,
-        0
-        ) AS districtClosedCount
-        FROM
-        esua_epdc_admin.sys_dept sd
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS topicResolvedCount,
-        IFNULL(COUNT(0), 0) AS inGroupTopicResolvedCount,
-        0 AS topicUnResolvedCount,
-        0 AS inGroupTopicUnResolvedCount
-        FROM
-        esua_epdc_group.epdc_topic et
-        WHERE
-        et.DEL_FLAG = '0'
-        AND DATE_FORMAT(et.UPDATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        AND et.STATE = '20'
-        GROUP BY
-        et.GRID_ID
-        ) topic ON topic.GRID_ID = sd.id
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS issueResolvedCount,
-        0 AS issueUnResolvedCount
-        FROM
-        esua_epdc_events.epdc_issue eis
-        WHERE
-        eis.DEL_FLAG = '0'
-        AND DATE_FORMAT(
-        eis.UPDATED_TIME,
-        '%Y-%m-%d'
-        ) &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        AND eis.ISSUE_STATE = '2'
-        GROUP BY
-        eis.GRID_ID
-        ) issue ON issue.GRID_ID = sd.id
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS issueProjectResolvedCount,
-        0 AS issueProjectUnResolvedCount,
-        0 AS approvalProjectResolvedCount,
-        0 AS approvalProjectUnResolvedCount
-        FROM
-        esua_epdc_events.epdc_item eit
-        WHERE
-        eit.DEL_FLAG = '0'
-        AND DATE_FORMAT(
-        eit.UPDATED_TIME,
-        '%Y-%m-%d'
-        ) &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        AND eit.ITEM_STATE IN ('5', '10')
-        GROUP BY
-        GRID_ID
-        ) item ON item.GRID_ID = sd.id
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS fromIssueResolvedInGridCount,
-        0 AS fromIssueUnResolvedInGridCount,
-        0 AS fromAgencyResolvedInGridCount,
-        0 AS fromAgencyUnResolvedInGridCount
-        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
-        WHERE
-        eit.DEL_FLAG = '0'
-        AND hp.DEL_FLAG = '0'
-        AND eit.ITEM_STATE IN ('5', '10')
-        GROUP BY
-        eit.GRID_ID,
-        eit.ID
-        HAVING
-        COUNT(DISTINCT hp.HANDLER_DEPT_ID) = 1
-        ) t
-        WHERE
-        t.GRID_ID = t.HANDLER_DEPT_ID
-        AND DATE_FORMAT(t.UPDATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        GROUP BY
-        t.GRID_ID
-        ) selfsolved ON selfsolved.GRID_ID = sd.id
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS communityClosedCount
-        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 = 'community_party'
-        GROUP BY
-        eit.GRID_ID,
-        eit.ID
-        ) t
-        WHERE
-        DATE_FORMAT(t.UPDATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        GROUP BY
-        t.GRID_ID
-        ) commsolved ON commsolved.GRID_ID = sd.id
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS streetClosedCount
-        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 = 'street_party'
-        GROUP BY
-        eit.GRID_ID,
-        eit.ID
-        ) t
-        WHERE
-        DATE_FORMAT(t.UPDATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        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') &lt;= 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'
-        AND sd.id NOT IN (
-        SELECT
-        t.dept_id
-        FROM
-        esua_epdc_admin.sys_dept_config t
-        WHERE
-        t.del_flag = '0'
-        )
-        GROUP BY
-        sd.id
-        ) info
+          SELECT
+            info.*,
+            IFNULL( ( info.inGroupTopicResolvedCount + info.inGroupTopicUnResolvedCount ) / info.problemResolvedCount, 0 ) AS groupSelfGovernRatio,
+            IFNULL( info.gridSelfGovernProjectTotal / info.problemResolvedNum, 0 ) AS gridSelfGovernRatio,
+            IFNULL( info.communityClosedCount / info.problemResolvedNum, 0 ) AS communityClosedRatio,
+            IFNULL( info.streetClosedCount / info.problemResolvedNum, 0 ) AS streetClosedRatio,
+            IFNULL( info.districtClosedCount / info.problemResolvedNum, 0 ) AS districtDeptClosedRatio
+        FROM
+            (
+            SELECT
+                DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y%m%d' ) AS dateId,
+                sd.id AS gridId,
+                sd.pid,
+                sd.pids,
+                IFNULL(
+                    (
+                        IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 )
+                    ), 0 ) AS problemResolvedCount,
+                IFNULL(
+                    (
+                        IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 ) + IFNULL( item.approvalProjectResolvedCount, 0 )
+                        + IFNULL( item.approvalProjectUnResolvedCount, 0 )
+                    ), 0 ) AS problemResolvedNum,
+
+                IFNULL( topic.topicResolvedCount, 0 ) AS topicResolvedCount,
+                IFNULL( topic.topicUnResolvedCount, 0 ) AS topicUnResolvedCount,
+                IFNULL( topic.inGroupTopicResolvedCount, 0 ) AS inGroupTopicResolvedCount,
+                IFNULL( topic.inGroupTopicUnResolvedCount, 0 ) AS inGroupTopicUnResolvedCount,
+
+                IFNULL( issue.issueResolvedCount, 0 ) AS issueResolvedCount,
+                IFNULL( issue.issueUnResolvedCount, 0 ) AS issueUnResolvedCount,
+
+                IFNULL( item.issueProjectResolvedCount, 0 ) AS issueProjectResolvedCount,
+                IFNULL( item.issueProjectUnResolvedCount, 0 ) AS issueProjectUnResolvedCount,
+                IFNULL( item.approvalProjectResolvedCount, 0 ) AS approvalProjectResolvedCount,
+                IFNULL( item.approvalProjectUnResolvedCount, 0 ) AS approvalProjectUnResolvedCount,
+
+                IFNULL( selfsolved.fromIssueResolvedInGridCount, 0 ) AS fromIssueResolvedInGridCount,
+                IFNULL( selfsolved.fromIssueUnResolvedInGridCount, 0 ) AS fromIssueUnResolvedInGridCount,
+                IFNULL( selfsolved.fromAgencyResolvedInGridCount, 0 ) AS fromAgencyResolvedInGridCount,
+                IFNULL( selfsolved.fromAgencyUnResolvedInGridCount, 0 ) AS fromAgencyUnResolvedInGridCount,
+
+                0 AS eventResolvedCount,
+                0 AS eventUnResolvedCount,
+
+                IFNULL( gridSelfGovernProjectTotal, 0) AS gridSelfGovernProjectTotal,
+                IFNULL( commsolved.communityClosedCount, 0 ) AS communityClosedCount,
+                IFNULL( streetsolved.streetClosedCount, 0 ) AS streetClosedCount,
+                IFNULL( districtsolved.districtClosedCount, 0 ) AS districtClosedCount
+            FROM
+                esua_epdc_admin.sys_dept sd
+                LEFT JOIN (
+                    SELECT
+                        GRID_ID,
+                        IFNULL( COUNT( 0 ), 0 ) AS topicResolvedCount,
+                        IFNULL( COUNT( 0 ), 0 ) AS inGroupTopicResolvedCount,
+                        0 AS topicUnResolvedCount,
+                        0 AS inGroupTopicUnResolvedCount
+                    FROM
+                        esua_epdc_group.epdc_topic et
+                    WHERE
+                        et.DEL_FLAG = '0'
+                        AND DATE_FORMAT( et.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                    AND et.STATE = '20'
+                    GROUP BY et.GRID_ID
+                ) topic ON topic.GRID_ID = sd.id
+                LEFT JOIN (
+                    SELECT
+                        GRID_ID,
+                        IFNULL( COUNT( 0 ), 0 ) AS issueResolvedCount,
+                        0 AS issueUnResolvedCount
+                    FROM
+                        esua_epdc_events.epdc_issue eis
+                    WHERE
+                        eis.DEL_FLAG = '0'
+                        AND DATE_FORMAT( eis.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                    AND eis.ISSUE_STATE = '2'
+                    GROUP BY 	eis.GRID_ID
+                ) issue ON issue.GRID_ID = sd.id
+                LEFT JOIN (
+                SELECT
+                    GRID_ID,
+                    IFNULL( SUM( IF((eit.`ITEM_STATE`)  = '10', 1, 0)), 0 ) AS issueProjectResolvedCount,
+                    IFNULL( SUM( IF((eit.`ITEM_STATE`)  = '5', 1, 0)), 0 )  AS issueProjectUnResolvedCount,
+                    0 AS approvalProjectResolvedCount,
+                    0 AS approvalProjectUnResolvedCount
+                FROM
+                    esua_epdc_events.epdc_item eit
+                WHERE
+                    eit.DEL_FLAG = '0'
+                    AND DATE_FORMAT( eit.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                AND eit.ITEM_STATE IN ( '5', '10' )
+                GROUP BY GRID_ID
+                ) item ON item.GRID_ID = sd.id
+                LEFT JOIN (
+                SELECT
+                    GRID_ID,
+                    IFNULL( SUM( IF((t.`ITEM_STATE`)  = '10', 1, 0)), 0 ) AS fromIssueResolvedInGridCount,
+                    IFNULL( SUM( IF((t.`ITEM_STATE`)  = '5', 1, 0)), 0 )  AS fromIssueUnResolvedInGridCount,
+                    0 AS fromAgencyResolvedInGridCount,
+                    0 AS fromAgencyUnResolvedInGridCount
+                FROM
+                    (
+                    SELECT
+                        GRID_ID,
+                        eit.id,
+                        hp.HANDLER_DEPT_ID,
+                        eit.UPDATED_TIME,
+                        eit.ITEM_STATE
+                    FROM
+                        esua_epdc_events.epdc_item eit
+                        LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
+                    WHERE
+                        eit.DEL_FLAG = '0'
+                        AND hp.DEL_FLAG = '0'
+                        AND eit.ITEM_STATE IN ( '5', '10' )
+                    GROUP BY eit.GRID_ID, eit.ID
+                    HAVING
+                        COUNT( DISTINCT hp.HANDLER_DEPT_ID ) = 1
+                    ) t
+                WHERE
+                    t.GRID_ID = t.HANDLER_DEPT_ID
+                    AND DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                GROUP BY
+                    t.GRID_ID
+                ) selfsolved ON selfsolved.GRID_ID = sd.id
+                LEFT JOIN (
+                    SELECT
+                        GRID_ID,
+                        IFNULL( COUNT( 0 ), 0 ) AS gridSelfGovernProjectTotal
+                    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 IN ('grid_party', 'grid_dept')
+                        GROUP BY eit.GRID_ID, eit.ID
+                        ) t
+                    WHERE
+                        DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                    GROUP BY t.GRID_ID
+                ) gridsolved ON gridsolved.GRID_ID = sd.id
+                LEFT JOIN (
+                    SELECT
+                        GRID_ID,
+                        IFNULL( COUNT( 0 ), 0 ) AS communityClosedCount
+                    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 IN ('community_party', 'community_dept')
+                        GROUP BY eit.GRID_ID, eit.ID
+                        ) t
+                    WHERE
+                        DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                    GROUP BY t.GRID_ID
+                ) commsolved ON commsolved.GRID_ID = sd.id
+                LEFT JOIN (
+                SELECT
+                    GRID_ID,
+                    IFNULL( COUNT( 0 ), 0 ) AS streetClosedCount
+                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 IN ('street_party', 'street_dept')
+                    GROUP BY eit.GRID_ID, eit.ID
+                    ) t
+                WHERE
+                    DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                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 IN ('district_party', 'district_dept')
+                    GROUP BY eit.GRID_ID, eit.ID
+                    ) t
+                WHERE
+                    DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= 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 IN ('grid_party', 'grid_dept')
+                AND sd.id NOT IN ( SELECT t.dept_id FROM esua_epdc_admin.sys_dept_config t WHERE t.del_flag = '0' )
+                GROUP BY sd.id
+            ) info
     </select>
 
     <select id="agencygoverndaily" resultType="com.elink.esua.epdc.dto.screen.result.ScreenAgencyGovernDailyResultDTO">
         SELECT
-        DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y%m%d'
-        ) AS dateId,
-        sd.id AS agencyId,
+            DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y%m%d' ) AS dateId,
+            sd.id AS agencyId,
         CASE
-        WHEN sd.type_key = 'community_party' THEN
-        'community'
-        WHEN sd.type_key = 'street_party' THEN
-        'street'
-        WHEN sd.type_key = 'district_party' THEN
-        'district'
-        END AS LEVEL,
-        sd.pid,
-        sd.pids,
-        IFNULL(
-        sum(info.problemResolvedCount),
-        0
-        ) AS problemResolvedCount,
-        IFNULL(
-        sum(info.topicResolvedCount),
-        0
-        ) AS topicResolvedCount,
-        IFNULL(
-        sum(info.topicUnResolvedCount),
-        0
-        ) AS topicUnResolvedCount,
-        IFNULL(
-        sum(info.issueResolvedCount),
-        0
-        ) AS issueResolvedCount,
-        IFNULL(
-        sum(info.issueUnResolvedCount),
-        0
-        ) AS issueUnResolvedCount,
-        IFNULL(
-        sum(
-        info.issueProjectResolvedCount
-        ),
-        0
-        ) AS issueProjectResolvedCount,
-        IFNULL(
-        sum(
-        info.issueProjectUnResolvedCount
-        ),
-        0
-        ) AS issueProjectUnResolvedCount,
-        IFNULL(
-        sum(
-        info.approvalProjectResolvedCount
-        ),
-        0
-        ) AS approvalProjectResolvedCount,
-        IFNULL(
-        sum(
-        info.approvalProjectUnResolvedCount
-        ),
-        0
-        ) AS approvalProjectUnResolvedCount,
-        IFNULL(
-        sum(
-        info.inGroupTopicResolvedCount
-        ),
-        0
-        ) AS inGroupTopicResolvedCount,
-        IFNULL(
-        sum(
-        info.inGroupTopicUnResolvedCount
-        ),
-        0
-        ) AS inGroupTopicUnResolvedCount,
-        IFNULL(
-        sum(
-        info.gridSelfGovernProjectTotal
-        ),
-        0
-        ) AS gridSelfGovernProjectTotal,
-        IFNULL(
-        sum(info.communityClosedCount),
-        0
-        ) AS communityClosedCount,
-        IFNULL(
-        sum(info.streetClosedCount),
-        0
-        ) AS streetClosedCount,
-        0 AS districtDeptClosedCount,
-        IFNULL(
-        (
-        sum(
-        info.inGroupTopicResolvedCount
-        ) + sum(
-        info.inGroupTopicUnResolvedCount
-        )
-        ) / sum(info.problemResolvedCount),
-        0
-        ) AS groupSelfGovernRatio,
-        IFNULL(
-        sum(
-        info.gridSelfGovernProjectTotal
-        ) / sum(info.problemResolvedCount),
-        0
-        ) AS gridSelfGovernRatio,
-        IFNULL(
-        sum(info.communityClosedCount) / sum(info.problemResolvedCount),
-        0
-        ) AS communityClosedRatio,
-        IFNULL(
-        sum(info.streetClosedCount) / sum(info.problemResolvedCount),
-        0
-        ) AS streetClosedRatio,
-        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
-        )
-        ),
-        0
-        ) AS problemResolvedCount,
-        IFNULL(topic.topicResolvedCount, 0) AS topicResolvedCount,
-        IFNULL(
-        topic.topicUnResolvedCount,
-        0
-        ) AS topicUnResolvedCount,
-        IFNULL(issue.issueResolvedCount, 0) AS issueResolvedCount,
-        IFNULL(
-        issue.issueUnResolvedCount,
-        0
-        ) AS issueUnResolvedCount,
-        IFNULL(
-        item.issueProjectResolvedCount,
-        0
-        ) AS issueProjectResolvedCount,
-        IFNULL(
-        item.issueProjectUnResolvedCount,
-        0
-        ) AS issueProjectUnResolvedCount,
-        IFNULL(
-        item.approvalProjectResolvedCount,
-        0
-        ) AS approvalProjectResolvedCount,
-        IFNULL(
-        item.approvalProjectUnResolvedCount,
-        0
-        ) AS approvalProjectUnResolvedCount,
-        IFNULL(
-        topic.inGroupTopicResolvedCount,
-        0
-        ) AS inGroupTopicResolvedCount,
-        IFNULL(
-        topic.inGroupTopicUnResolvedCount,
-        0
-        ) AS inGroupTopicUnResolvedCount,
-        IFNULL(
-        selfsolved.fromIssueResolvedInGridCount,
-        0
-        ) AS fromIssueResolvedInGridCount,
-        IFNULL(
-        selfsolved.fromIssueUnResolvedInGridCount,
-        0
-        ) AS fromIssueUnResolvedInGridCount,
-        IFNULL(
-        selfsolved.fromAgencyResolvedInGridCount,
-        0
-        ) AS fromAgencyResolvedInGridCount,
-        IFNULL(
-        selfsolved.fromAgencyUnResolvedInGridCount,
-        0
-        ) AS fromAgencyUnResolvedInGridCount,
-        IFNULL(
-        (
-        selfsolved.fromIssueResolvedInGridCount + selfsolved.fromIssueUnResolvedInGridCount + selfsolved.fromIssueUnResolvedInGridCount + selfsolved.fromAgencyResolvedInGridCount
-        ),
-        0
-        ) AS gridSelfGovernProjectTotal,
-        IFNULL(
-        commsolved.communityClosedCount,
-        0
-        ) AS communityClosedCount,
-        IFNULL(
-        streetsolved.streetClosedCount,
-        0
-        ) AS streetClosedCount,
-        IFNULL(
-        districtsolved.districtClosedCount,
-        0
-        ) AS districtClosedCount
-        FROM
-        esua_epdc_admin.sys_dept sd
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS topicResolvedCount,
-        IFNULL(COUNT(0), 0) AS inGroupTopicResolvedCount,
-        0 AS topicUnResolvedCount,
-        0 AS inGroupTopicUnResolvedCount
-        FROM
-        esua_epdc_group.epdc_topic et
-        WHERE
-        et.DEL_FLAG = '0'
-        AND DATE_FORMAT(et.UPDATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        AND et.STATE = '20'
-        GROUP BY
-        et.GRID_ID
-        ) topic ON topic.GRID_ID = sd.id
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS issueResolvedCount,
-        0 AS issueUnResolvedCount
-        FROM
-        esua_epdc_events.epdc_issue eis
-        WHERE
-        eis.DEL_FLAG = '0'
-        AND DATE_FORMAT(
-        eis.UPDATED_TIME,
-        '%Y-%m-%d'
-        ) &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        AND eis.ISSUE_STATE = '2'
-        GROUP BY
-        eis.GRID_ID
-        ) issue ON issue.GRID_ID = sd.id
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS issueProjectResolvedCount,
-        0 AS issueProjectUnResolvedCount,
-        0 AS approvalProjectResolvedCount,
-        0 AS approvalProjectUnResolvedCount
-        FROM
-        esua_epdc_events.epdc_item eit
-        WHERE
-        eit.DEL_FLAG = '0'
-        AND DATE_FORMAT(
-        eit.UPDATED_TIME,
-        '%Y-%m-%d'
-        ) &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        AND eit.ITEM_STATE IN ('5', '10')
-        GROUP BY
-        GRID_ID
-        ) item ON item.GRID_ID = sd.id
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS fromIssueResolvedInGridCount,
-        0 AS fromIssueUnResolvedInGridCount,
-        0 AS fromAgencyResolvedInGridCount,
-        0 AS fromAgencyUnResolvedInGridCount
-        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
-        WHERE
-        eit.DEL_FLAG = '0'
-        AND hp.DEL_FLAG = '0'
-        AND eit.ITEM_STATE IN ('5', '10')
-        GROUP BY
-        eit.GRID_ID,
-        eit.ID
-        HAVING
-        COUNT(DISTINCT hp.HANDLER_DEPT_ID) = 1
-        ) t
-        WHERE
-        t.GRID_ID = t.HANDLER_DEPT_ID
-        AND DATE_FORMAT(t.UPDATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        GROUP BY
-        t.GRID_ID
-        ) selfsolved ON selfsolved.GRID_ID = sd.id
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS communityClosedCount
-        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 = 'community_party'
-        GROUP BY
-        eit.GRID_ID,
-        eit.ID
-        ) t
-        WHERE
-        DATE_FORMAT(t.UPDATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        GROUP BY
-        t.GRID_ID
-        ) commsolved ON commsolved.GRID_ID = sd.id
-        LEFT JOIN (
-        SELECT
-        GRID_ID,
-        IFNULL(COUNT(0), 0) AS streetClosedCount
-        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 = 'street_party'
-        GROUP BY
-        eit.GRID_ID,
-        eit.ID
-        ) t
-        WHERE
-        DATE_FORMAT(t.UPDATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
-        date_add(now(), INTERVAL - 1 DAY),
-        '%Y-%m-%d'
-        )
-        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') &lt;= 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'
-        AND sd.id NOT IN (
-        SELECT
-        t.dept_id
-        FROM
-        esua_epdc_admin.sys_dept_config t
-        WHERE
-        t.del_flag = '0'
-        )
-        GROUP BY
-        sd.id
-        ) info
-        LEFT JOIN esua_epdc_admin.sys_dept sd ON find_in_set(sd.`id`, info.pids)
-        WHERE
-        sd.del_flag = '0'
-        AND sd.id NOT IN (
-        SELECT
-        t.dept_id
-        FROM
-        esua_epdc_admin.sys_dept_config t
+
+                WHEN sd.type_key = 'community_party' || sd.type_key = 'community_dept' THEN
+                'community'
+                WHEN sd.type_key = 'street_party' ||sd.type_key = 'street_dept' THEN
+                'street'
+                WHEN sd.type_key = 'district_party' || sd.type_key = 'district_dept' THEN
+                'district'
+            END AS LEVEL,
+            sd.pid,
+            sd.pids,
+            IFNULL( sum( info.problemResolvedCount ), 0 ) AS problemResolvedCount,
+            IFNULL( sum( info.topicResolvedCount ), 0 ) AS topicResolvedCount,
+            IFNULL( sum( info.topicUnResolvedCount ), 0 ) AS topicUnResolvedCount,
+            IFNULL( sum( info.issueResolvedCount ), 0 ) AS issueResolvedCount,
+            IFNULL( sum( info.issueUnResolvedCount ), 0 ) AS issueUnResolvedCount,
+            IFNULL( sum( info.issueProjectResolvedCount ), 0 ) AS issueProjectResolvedCount,
+            IFNULL( sum( info.issueProjectUnResolvedCount ), 0 ) AS issueProjectUnResolvedCount,
+            IFNULL( sum( info.approvalProjectResolvedCount ), 0 ) AS approvalProjectResolvedCount,
+            IFNULL( sum( info.approvalProjectUnResolvedCount ), 0 ) AS approvalProjectUnResolvedCount,
+            IFNULL( sum( info.inGroupTopicResolvedCount ), 0 ) AS inGroupTopicResolvedCount,
+            IFNULL( sum( info.inGroupTopicUnResolvedCount ), 0 ) AS inGroupTopicUnResolvedCount,
+            IFNULL( sum( info.gridSelfGovernProjectTotal ), 0 ) AS gridSelfGovernProjectTotal,
+            IFNULL( sum( info.communityClosedCount ), 0 ) AS communityClosedCount,
+            IFNULL( sum( info.streetClosedCount ), 0 ) AS streetClosedCount,
+            0 AS districtDeptClosedCount,
+
+            0 AS eventResolvedCount,
+            0 AS eventUnResolvedCount,
+
+            IFNULL( ( sum( info.inGroupTopicResolvedCount ) + sum( info.inGroupTopicUnResolvedCount ) )
+            / sum( info.problemResolvedCount ), 0 ) AS groupSelfGovernRatio,
+            IFNULL( sum( info.gridSelfGovernProjectTotal ) / sum( info.problemResolvedNum ), 0 ) AS gridSelfGovernRatio,
+            IFNULL( sum( info.communityClosedCount ) / sum( info.problemResolvedNum ), 0 ) AS communityClosedRatio,
+            IFNULL( sum( info.streetClosedCount ) / sum( info.problemResolvedNum ), 0 ) AS streetClosedRatio,
+            IFNULL( sum( info.districtClosedCount ) / sum( info.problemResolvedNum ), 0 ) AS districtDeptClosedRatio
+        FROM
+            (
+            SELECT
+                sd.pids,
+                IFNULL ((
+                    IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 )
+                ), 0 ) AS problemResolvedCount,
+
+                IFNULL(
+                    (
+                        IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 ) + IFNULL( item.approvalProjectResolvedCount, 0 )
+                        + IFNULL( item.approvalProjectUnResolvedCount, 0 )
+                    ), 0 ) AS problemResolvedNum,
+
+                IFNULL( topic.topicResolvedCount, 0 ) AS topicResolvedCount,
+                IFNULL( topic.topicUnResolvedCount, 0 ) AS topicUnResolvedCount,
+                IFNULL( issue.issueResolvedCount, 0 ) AS issueResolvedCount,
+                IFNULL( issue.issueUnResolvedCount, 0 ) AS issueUnResolvedCount,
+                IFNULL( item.issueProjectResolvedCount, 0 ) AS issueProjectResolvedCount,
+                IFNULL( item.issueProjectUnResolvedCount, 0 ) AS issueProjectUnResolvedCount,
+                IFNULL( item.approvalProjectResolvedCount, 0 ) AS approvalProjectResolvedCount,
+                IFNULL( item.approvalProjectUnResolvedCount, 0 ) AS approvalProjectUnResolvedCount,
+                IFNULL( topic.inGroupTopicResolvedCount, 0 ) AS inGroupTopicResolvedCount,
+                IFNULL( topic.inGroupTopicUnResolvedCount, 0 ) AS inGroupTopicUnResolvedCount,
+                IFNULL( selfsolved.fromIssueResolvedInGridCount, 0 ) AS fromIssueResolvedInGridCount,
+                IFNULL( selfsolved.fromIssueUnResolvedInGridCount, 0 ) AS fromIssueUnResolvedInGridCount,
+                IFNULL( selfsolved.fromAgencyResolvedInGridCount, 0 ) AS fromAgencyResolvedInGridCount,
+                IFNULL( selfsolved.fromAgencyUnResolvedInGridCount, 0 ) AS fromAgencyUnResolvedInGridCount,
+
+                IFNULL( gridSelfGovernProjectTotal, 0 ) AS gridSelfGovernProjectTotal,
+                IFNULL( commsolved.communityClosedCount, 0 ) AS communityClosedCount,
+                IFNULL( streetsolved.streetClosedCount, 0 ) AS streetClosedCount,
+                IFNULL( districtsolved.districtClosedCount, 0 ) AS districtClosedCount
+            FROM
+                esua_epdc_admin.sys_dept sd
+                LEFT JOIN (
+                SELECT
+                    GRID_ID,
+                    IFNULL( COUNT( 0 ), 0 ) AS topicResolvedCount,
+                    IFNULL( COUNT( 0 ), 0 ) AS inGroupTopicResolvedCount,
+                    0 AS topicUnResolvedCount,
+                    0 AS inGroupTopicUnResolvedCount
+                FROM
+                    esua_epdc_group.epdc_topic et
+                WHERE
+                    et.DEL_FLAG = '0'
+                    AND DATE_FORMAT( et.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                AND et.STATE = '20'
+                GROUP BY
+                    et.GRID_ID
+                ) topic ON topic.GRID_ID = sd.id
+                LEFT JOIN (
+                SELECT
+                    GRID_ID,
+                    IFNULL( COUNT( 0 ), 0 ) AS issueResolvedCount,
+                    0 AS issueUnResolvedCount
+                FROM
+                    esua_epdc_events.epdc_issue eis
+                WHERE
+                    eis.DEL_FLAG = '0'
+                    AND DATE_FORMAT( eis.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                AND eis.ISSUE_STATE = '2'
+                GROUP BY
+                    eis.GRID_ID
+                ) issue ON issue.GRID_ID = sd.id
+                LEFT JOIN (
+                SELECT
+                    GRID_ID,
+                    IFNULL( SUM( IF((eit.`ITEM_STATE`)  = '10', 1, 0)), 0 ) AS issueProjectResolvedCount,
+                    IFNULL( SUM( IF((eit.`ITEM_STATE`)  = '5', 1, 0)), 0 )  AS issueProjectUnResolvedCount,
+                    0 AS approvalProjectResolvedCount,
+                    0 AS approvalProjectUnResolvedCount
+                FROM
+                    esua_epdc_events.epdc_item eit
+                WHERE
+                    eit.DEL_FLAG = '0'
+                    AND DATE_FORMAT( eit.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                AND eit.ITEM_STATE IN ( '5', '10' )
+                GROUP BY
+                    GRID_ID
+                ) item ON item.GRID_ID = sd.id
+                LEFT JOIN (
+                SELECT
+                    GRID_ID,
+                    IFNULL( SUM( IF((t.`ITEM_STATE`)  = '10', 1, 0)), 0 ) AS fromIssueResolvedInGridCount,
+                    IFNULL( SUM( IF((t.`ITEM_STATE`)  = '5', 1, 0)), 0 )  AS fromIssueUnResolvedInGridCount,
+                    0 AS fromAgencyResolvedInGridCount,
+                    0 AS fromAgencyUnResolvedInGridCount
+                FROM
+                    (
+                    SELECT
+                        GRID_ID,
+                        eit.id,
+                        hp.HANDLER_DEPT_ID,
+                        eit.UPDATED_TIME,
+                        eit.ITEM_STATE
+                    FROM
+                        esua_epdc_events.epdc_item eit
+                        LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
+                    WHERE
+                        eit.DEL_FLAG = '0'
+                        AND hp.DEL_FLAG = '0'
+                        AND eit.ITEM_STATE IN ( '5', '10' )
+                    GROUP BY
+                        eit.GRID_ID,
+                        eit.ID
+                    HAVING
+                        COUNT( DISTINCT hp.HANDLER_DEPT_ID ) = 1
+                    ) t
+                WHERE
+                    t.GRID_ID = t.HANDLER_DEPT_ID
+                    AND DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                GROUP BY
+                    t.GRID_ID
+                ) selfsolved ON selfsolved.GRID_ID = sd.id
+
+                LEFT JOIN (
+                    SELECT
+                        GRID_ID,
+                        IFNULL( COUNT( 0 ), 0 ) AS gridSelfGovernProjectTotal
+                    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 IN ('grid_party', 'grid_dept')
+                        GROUP BY eit.GRID_ID, eit.ID
+                        ) t
+                    WHERE
+                        DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                    GROUP BY t.GRID_ID
+                ) gridsolved ON gridsolved.GRID_ID = sd.id
+                LEFT JOIN (
+                SELECT
+                    GRID_ID,
+                    IFNULL( COUNT( 0 ), 0 ) AS communityClosedCount
+                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 IN ('community_party', 'community_dept')
+                    GROUP BY
+                        eit.GRID_ID,
+                        eit.ID
+                    ) t
+                WHERE
+                    DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                GROUP BY
+                    t.GRID_ID
+                ) commsolved ON commsolved.GRID_ID = sd.id
+                LEFT JOIN (
+                SELECT
+                    GRID_ID,
+                    IFNULL( COUNT( 0 ), 0 ) AS streetClosedCount
+                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 IN ('street_party', 'street_dept')
+                    GROUP BY
+                        eit.GRID_ID,
+                        eit.ID
+                    ) t
+                WHERE
+                    DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                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 IN ('district_party', 'district_dept')
+                    GROUP BY
+                        eit.GRID_ID,
+                        eit.ID
+                    ) t
+                WHERE
+                    DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= 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'
+                AND sd.id NOT IN ( SELECT t.dept_id FROM esua_epdc_admin.sys_dept_config t WHERE t.del_flag = '0' )
+            GROUP BY
+                sd.id
+            ) info
+            LEFT JOIN esua_epdc_admin.sys_dept sd ON find_in_set( sd.`id`, info.pids )
         WHERE
-        t.del_flag = '0'
-        )
-        AND sd.type_key IN (
-            'community_party',
-            'street_party',
-            'district_party'
-        )
+            sd.del_flag = '0'
+            AND sd.id NOT IN ( SELECT t.dept_id FROM esua_epdc_admin.sys_dept_config t WHERE t.del_flag = '0' )
+            AND sd.type_key IN ( 'community_party', 'community_dept', 'street_party', 'street_dept', 'district_party', 'district_dept' )
         GROUP BY
-        sd.id
+            sd.id
     </select>
 </mapper>