diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportController.java
index 9be7fff..d2043a3 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportController.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportController.java
@@ -2,6 +2,7 @@ package com.elink.esua.epdc.modules.screen.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.modules.screen.service.ScreenBaseReportService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author zhy
  * @date 2021/6/28 11:07
  */
+@Slf4j
 @RestController
 @RequestMapping("data/stats/basereport")
 public class ScreenBaseReportController {
@@ -30,6 +32,7 @@ public class ScreenBaseReportController {
      */
     @PostMapping("gridHotTopic")
     public Result gridHotTopic() {
+        log.info("<gridHotTopic|网格热议话题数据>定时任务执行");
         return screenBaseReportService.gridHotTopic();
     }
 
@@ -43,6 +46,7 @@ public class ScreenBaseReportController {
      */
     @PostMapping("agencyHotTopic")
     public Result agencyHotTopic() {
+        log.info("<agencyHotTopic|组织热议话题数据>定时任务执行");
         return screenBaseReportService.agencyHotTopic();
     }
 
@@ -56,6 +60,7 @@ public class ScreenBaseReportController {
      */
     @PostMapping("gridIssue")
     public Result gridIssue() {
+        log.info("<gridIssue|网格议题数据>定时任务执行");
         return screenBaseReportService.gridIssue();
     }
 
@@ -69,6 +74,7 @@ public class ScreenBaseReportController {
      */
     @PostMapping("agencyIssue")
     public Result agencyIssue() {
+        log.info("<agencyIssue|组织议题数据>定时任务执行");
         return screenBaseReportService.agencyIssue();
     }
 
@@ -82,6 +88,7 @@ public class ScreenBaseReportController {
      */
     @PostMapping("gridRegUser")
     public Result gridRegUser() {
+        log.info("<gridRegUser|网格注册用户数据>定时任务执行");
         return screenBaseReportService.gridRegUser();
     }
 
@@ -95,7 +102,109 @@ public class ScreenBaseReportController {
      */
     @PostMapping("agencyRegUser")
     public Result agencyRegUser() {
+        log.info("<agencyRegUser|组织注册用户数据>定时任务执行");
         return screenBaseReportService.agencyRegUser();
     }
 
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 网格状态话题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param []
+     **/
+    @PostMapping("gridtopicstatus")
+    Result gridTopicStatus() {
+        log.info("<gridtopicstatus|网格状态话题数据>定时任务执行");
+        return screenBaseReportService.gridTopicStatus();
+    }
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 组织状态话题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param []
+     **/
+    @PostMapping("agencytopicstatus")
+    Result agencyTopicStatus() {
+        log.info("<agencytopicstatus|组织状态话题数据>定时任务执行");
+        return screenBaseReportService.agencyTopicStatus();
+    }
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 网格话题转议题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param []
+     **/
+    @PostMapping("gridtopicissue")
+    Result gridTopicIssue() {
+        log.info("<gridtopicissue|网格话题转议题数据>定时任务执行");
+        return screenBaseReportService.gridTopicIssue();
+    }
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 组织话题转议题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param []
+     **/
+    @PostMapping("agencytopicissue")
+    Result agencyTopicIssue() {
+        log.info("<agencytopicissue|组织话题转议题数据>定时任务执行");
+        return screenBaseReportService.agencyTopicIssue();
+    }
+
+    /**
+     * @Description 网格项目数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    @PostMapping("gridproject")
+    Result selectGridProjectList() {
+        log.info("<gridproject|网格项目数据>定时任务执行");
+        return screenBaseReportService.selectGridProjectList();
+    }
+
+    /**
+     * @Description 组织项目数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    @PostMapping("agencyproject")
+    Result selectCommunityProjectList() {
+        log.info("<agencyproject|组织项目数据>定时任务执行");
+        return screenBaseReportService.selectCommunityProjectList();
+    }
+
+    /**
+     * @Description 网格群组总数
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    @PostMapping("gridgrouptotal")
+    Result selectGridGroupTotalList() {
+        log.info("<gridgrouptotal|网格群组总数>定时任务执行");
+        return screenBaseReportService.selectGridGroupTotalList();
+    }
+
+    /**
+     * @Description 组织群组总数
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    @PostMapping("agencygrouptotal")
+    Result selectCommunityGroupTotalList() {
+        log.info("<agencygrouptotal|组织群组总数>定时任务执行");
+        return screenBaseReportService.selectCommunityGroupTotalList();
+    }
+
 }
diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDao.java
index e8bf0cb..686b112 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDao.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDao.java
@@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.screen.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.screen.result.*;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -88,4 +89,78 @@ public interface ScreenBaseReportDao extends BaseDao<ScreenBaseReportResultDTO>
      * @date 2021/6/28 14:07
      */
     List<ScreenAgencyRegUserResultDTO> agencyRegUser();
+
+    /**
+     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridTopicStatusResultDTO>
+     * @Description 网格状态话题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    List<GridTopicStatusResultDTO> selectGridTopicStatusList(@Param("customId") String customId);
+
+    /**
+     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridTopicStatusResultDTO>
+     * @Description 社区状态话题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    List<CommunityTopicStatusResultDTO> selectCommunityTopicStatusList(@Param("customId") String customId);
+
+    /**
+     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridTopicIssueResultDTO>
+     * @Description 网格话题转议题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    List<GridTopicIssueResultDTO> selectGridTopicIssueList(@Param("customId") String customId);
+
+    /**
+     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridTopicIssueResultDTO>
+     * @Description 社区话题转议题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    List<CommunityTopicIssueResultDTO> selectCommunityTopicIssueList(@Param("customId") String customId);
+
+    /**
+     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridGridProjectResultDTO>
+     * @Description 网格项目数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    List<GridGridProjectResultDTO> selectGridProjectList(@Param("customId") String customId);
+
+    /**
+     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.CommunityProjectResultDTO>
+     * @Description 组织项目数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    List<CommunityProjectResultDTO> selectCommunityProjectList(@Param("customId") String customId);
+
+
+    /**
+     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridGroupTotalResultDTO>
+     * @Description 网格群组总数
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    List<GridGroupTotalResultDTO> selectGridGroupTotalList(@Param("customId") String customId);
+
+
+    /**
+     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.CommunityGroupTotalResultDTO>
+     * @Description 组织群组总数
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    List<CommunityGroupTotalResultDTO> selectCommunityGroupTotalList(@Param("customId") String customId);
 }
diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportService.java
index b26f775..456c8fe 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportService.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportService.java
@@ -70,4 +70,75 @@ public interface ScreenBaseReportService {
      */
     Result agencyRegUser();
 
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 网格状态话题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param []
+     **/
+    Result gridTopicStatus();
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 组织状态话题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param []
+     **/
+    Result agencyTopicStatus();
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 网格话题转议题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param []
+     **/
+    Result gridTopicIssue();
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 组织话题转议题数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param []
+     **/
+    Result agencyTopicIssue();
+
+    /**
+     * @Description 网格项目数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    Result selectGridProjectList();
+
+    /**
+     * @Description 组织项目数据
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    Result selectCommunityProjectList();
+
+
+    /**
+     * @Description 网格群组总数
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    Result selectGridGroupTotalList();
+
+
+    /**
+     * @Description 组织群组总数
+     * @Author songyunpeng
+     * @Date 2021/6/25
+     * @Param [customId]
+     **/
+    Result selectCommunityGroupTotalList();
+
+
 }
diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportServiceImpl.java
index f1d84c9..41b23f4 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportServiceImpl.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportServiceImpl.java
@@ -8,7 +8,7 @@ import com.elink.esua.epdc.dto.screen.result.*;
 import com.elink.esua.epdc.modules.screen.dao.ScreenBaseReportDao;
 import com.elink.esua.epdc.modules.screen.service.ScreenBaseReportService;
 import com.elink.esua.epdc.utils.EpmetUtils;
-import lombok.extern.slf4j.Slf4j;
+import com.elink.esua.epdc.utils.ScreenDataUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -23,7 +23,6 @@ import java.util.List;
  * @date 2021/6/28 13:51
  */
 @Service
-@Slf4j
 public class ScreenBaseReportServiceImpl extends BaseServiceImpl<ScreenBaseReportDao, ScreenBaseReportResultDTO> implements ScreenBaseReportService {
 
     @Autowired
@@ -97,4 +96,77 @@ public class ScreenBaseReportServiceImpl extends BaseServiceImpl<ScreenBaseRepor
         epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_AGENCY_REG_USER, JSONObject.toJSONString(jsonObject));
         return new Result();
     }
+
+    @Override
+    public Result gridTopicStatus() {
+        List<GridTopicStatusResultDTO> gridTopicStatusResultDTOS = baseDao.selectGridTopicStatusList(EPMET_CONFIG_CUSTOMER_ID);
+        String dataJson = ScreenDataUtils.getScreenDateJson(gridTopicStatusResultDTOS, true);
+        // 数据上报
+        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_TOPIC_STATUS, dataJson);
+        return new Result();
+    }
+
+    @Override
+    public Result agencyTopicStatus() {
+        List<CommunityTopicStatusResultDTO> communityTopicStatusResultDTOS = baseDao.selectCommunityTopicStatusList(EPMET_CONFIG_CUSTOMER_ID);
+        String dataJson = ScreenDataUtils.getScreenDateJson(communityTopicStatusResultDTOS, true);
+        // 数据上报
+        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_TOPIC_STATUS, dataJson);
+        return new Result();
+    }
+
+    @Override
+    public Result gridTopicIssue() {
+        List<GridTopicIssueResultDTO> gridTopicIssueResultDTOS = baseDao.selectGridTopicIssueList(EPMET_CONFIG_CUSTOMER_ID);
+        String dataJson = ScreenDataUtils.getScreenDateJson(gridTopicIssueResultDTOS, true);
+        // 数据上报
+        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_TOPIC_ISSUE, dataJson);
+        return new Result();
+    }
+
+    @Override
+    public Result agencyTopicIssue() {
+        List<CommunityTopicIssueResultDTO> communityTopicIssueResultDTOS = baseDao.selectCommunityTopicIssueList(EPMET_CONFIG_CUSTOMER_ID);
+        String dataJson = ScreenDataUtils.getScreenDateJson(communityTopicIssueResultDTOS, true);
+        // 数据上报
+        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGNENCY_TOPIC_ISSUE, dataJson);
+        return new Result();
+    }
+
+    @Override
+    public Result selectGridProjectList() {
+        List<GridGridProjectResultDTO> gridGridProjectResultDTOS = baseDao.selectGridProjectList(EPMET_CONFIG_CUSTOMER_ID);
+        String dataJson = ScreenDataUtils.getScreenDateJson(gridGridProjectResultDTOS, true);
+        // 数据上报
+        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson);
+        return new Result();
+    }
+
+    @Override
+    public Result selectCommunityProjectList() {
+        List<CommunityProjectResultDTO> communityProjectResultDTOS = baseDao.selectCommunityProjectList(EPMET_CONFIG_CUSTOMER_ID);
+        String dataJson = ScreenDataUtils.getScreenDateJson(communityProjectResultDTOS, true);
+        // 数据上报
+        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson);
+        return new Result();
+    }
+
+    @Override
+    public Result selectGridGroupTotalList() {
+        List<GridGroupTotalResultDTO> gridGroupTotalResultDTOS = baseDao.selectGridGroupTotalList(EPMET_CONFIG_CUSTOMER_ID);
+        String dataJson = ScreenDataUtils.getScreenDateJson(gridGroupTotalResultDTOS, true);
+        // 数据上报
+        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_GROUP_TOTAL, dataJson);
+        return new Result();
+    }
+
+    @Override
+    public Result selectCommunityGroupTotalList() {
+        List<CommunityTopicIssueResultDTO> communityTopicIssueResultDTOS = baseDao.selectCommunityTopicIssueList(EPMET_CONFIG_CUSTOMER_ID);
+        String dataJson = ScreenDataUtils.getScreenDateJson(communityTopicIssueResultDTOS, true);
+        // 数据上报
+        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_GROUP_TOTAL, dataJson);
+        return new Result();
+    }
+
 }
diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBaseReportDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBaseReportDao.xml
index 265da84..f91b88b 100644
--- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBaseReportDao.xml
+++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBaseReportDao.xml
@@ -1267,4 +1267,386 @@
             )
     </select>
 
+    <select id="selectGridTopicStatusList"
+            resultType="com.elink.esua.epdc.dto.screen.result.GridTopicStatusResultDTO">
+
+
+ select t.*,
+        #{customId}                                                                                          as customerId,
+        DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as dateId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'W',
+        WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y')       AS yearId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'Q',
+        QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
+        '%Y-%m-%d')))                                                                 quarterId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId
+
+        from
+        (
+        select
+        grid.pid                                                                                              as agencyId,
+        grid.id                                                                                               as gridId,
+        'discussi'                                                                                            as topicStatusId,
+        count(et.STATE = 0 or null)                                                                                          as topicCount,
+            ifnull(round(ifnull(count(et.STATE = 0 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
+            ifnull(count(et.STATE = 0 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)                                                                     as topicIncrement
+
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
+        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        where grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        group by grid.id
+
+        union  all
+        select
+        grid.pid                                                                                              as agencyId,
+        grid.id                                                                                               as gridId,
+        'hidden'                                                                                            as topicStatusId,
+        count(et.SHIELD_FLAG = 1 or null)                                                                                          as topicCount,
+            ifnull(round(ifnull(count(et.SHIELD_FLAG = 1 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
+            ifnull(count(et.SHIELD_FLAG = 1 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
+        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        where grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        group by grid.id
+
+        union all
+
+
+        select
+        grid.pid                                                                                              as agencyId,
+        grid.id                                                                                               as gridId,
+        'closed'                                                                                            as topicStatusId,
+        count(et.STATE = 20 or null)                                                                                          as topicCount,
+            ifnull(round(ifnull(count(et.STATE = 20 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
+            ifnull(count(et.STATE = 20 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)                                                                   as topicIncrement
+
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
+        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        where grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        group by grid.id
+        )t
+
+    </select>
+    <select id="selectCommunityTopicStatusList"
+            resultType="com.elink.esua.epdc.dto.screen.result.CommunityTopicStatusResultDTO">
+
+
+
+        select t.*,
+              #{customId}                                                                                                   as customerId,
+        DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as dateId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'W',
+        WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y')       AS yearId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'Q',
+        QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
+        '%Y-%m-%d')))                                                                 quarterId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId
+        from
+        (
+
+        select
+            community.id                                                                                              as agencyId,
+            community.pid                                                                                               as pid,
+            'discussi'                                                                                            as topicStatusId,
+            count(et.STATE = 0 or null)                                                                                          as topicCount,
+            ifnull(round(ifnull(count(et.STATE = 0 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
+            ifnull(count(et.STATE = 0 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)                                                                     as topicIncrement
+            from esua_epdc_admin.sys_dept grid
+            left join esua_epdc_admin.sys_dept community on grid.pid = community.id
+            left join `esua_epdc_party_group`.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
+            and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+            where grid.del_flag = '0'
+            and grid.type_key = 'grid_party'
+            and community.del_flag = '0'
+            and community.type_key = 'community_party'
+            and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+            and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+            group by community.id
+
+
+
+        union all
+
+
+        select
+            community.id                                                                                              as agencyId,
+            community.pid                                                                                               as pid,
+            'hidden'                                                                                            as topicStatusId,
+            count(et.SHIELD_FLAG = 1 or null)                                                                                          as topicCount,
+            ifnull(round(ifnull(count(et.SHIELD_FLAG = 1 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
+            ifnull(count(et.SHIELD_FLAG = 1 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)                                                                     as topicIncrement
+            from esua_epdc_admin.sys_dept grid
+            left join esua_epdc_admin.sys_dept community on grid.pid = community.id
+            left join `esua_epdc_party_group`.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
+            and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+            where grid.del_flag = '0'
+            and grid.type_key = 'grid_party'
+            and community.del_flag = '0'
+            and community.type_key = 'community_party'
+            and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+            and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+            group by community.id
+
+        union all
+
+
+        select
+            community.id                                                                                              as agencyId,
+            community.pid                                                                                               as pid,
+            'closed'                                                                                            as topicStatusId,
+            count(et.STATE = 20 or null)                                                                                          as topicCount,
+            ifnull(round(ifnull(count(et.STATE = 20 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
+            ifnull(count(et.STATE = 20 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)                                                                     as topicIncrement
+            from esua_epdc_admin.sys_dept grid
+            left join esua_epdc_admin.sys_dept community on grid.pid = community.id
+            left join `esua_epdc_party_group`.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
+            and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+            where grid.del_flag = '0'
+            and grid.type_key = 'grid_party'
+            and community.del_flag = '0'
+            and community.type_key = 'community_party'
+            and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+            and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+            group by community.id
+
+        )t;
+    </select>
+    <select id="selectGridTopicIssueList"
+            resultType="com.elink.esua.epdc.dto.screen.result.GridTopicIssueResultDTO">
+
+        select
+        #{customId}                                                                                                    as customerId,
+        DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as dateId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'W',
+        WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y')       AS yearId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'Q',
+        QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
+        '%Y-%m-%d')))                                                                 quarterId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId,
+        grid.pid                                                                                              as agencyId,
+        grid.id                                                                                               as gridId,
+        ifnull(count(et.ID),0)                                                                                         as issueTotal,
+        ifnull((count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null)),0)  as issueIncr
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' and et.PARTY_MEMBER = '1'
+        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        where grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        group by grid.id;
+
+    </select>
+    <select id="selectCommunityTopicIssueList"
+            resultType="com.elink.esua.epdc.dto.screen.result.CommunityTopicIssueResultDTO">
+       select
+        #{customId}                                                                                                    as customerId,
+        DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as datetd,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'W',
+        WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y')       AS yearId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'Q',
+        QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
+        '%Y-%m-%d')))                                                                 quarterId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId,
+        community.id                                                                                              as agencyId,
+        community.pid                                                                                               as pid,
+        ifnull(count(et.ID),0)                                                                                          as issueTotal,
+        ifnull((count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null)),0)  as issuetncr
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_admin.sys_dept community on grid.pid = community.id
+        left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' and et.`PARTY_MEMBER` = '1'
+        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        where grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and community.del_flag = '0'
+        and community.type_key = 'community_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        group by community.id;
+    </select>
+    <select id="selectGridProjectList"
+            resultType="com.elink.esua.epdc.dto.screen.result.GridGridProjectResultDTO">
+        select
+        grid.id as gridId,
+        grid.pid as agencyId,
+        #{customId}                                                                                            as customerId,
+        DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as dateId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'W',
+        WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y')       AS yearId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'Q',
+        QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
+        '%Y-%m-%d')))                                                                 quarterId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId,
+        ifnull(count(ei.ID),0) as projectTotal,
+        ifnull(count(ei.ITEM_STATE = '0' or null),0) as pendingTotal,
+        ifnull(round(ifnull(count(ei.ITEM_STATE = '0' or null),0) / ifnull(count(ei.ID),0) * 100),0)  as pendingRatio,
+
+        ifnull(count(ei.ITEM_STATE = '10' or ei.ITEM_STATE = '5' or null),0) as closedTotal,
+        ifnull(round(ifnull(count(ei.ITEM_STATE = '10' or ei.ITEM_STATE = '5' or null),0) / ifnull(count(ei.ID),0) * 100),0)  as closedRatio,
+
+        ifnull(count(ei.ITEM_STATE = '10' or null),0) as resolvedTotal,
+        ifnull(round(ifnull(count(ei.ITEM_STATE = '10' or null),0) / ifnull(count(ei.ITEM_STATE = '10' or ei.ITEM_STATE = '5' or null),0) * 100),0)  as resolvedRatio,
+
+
+        ifnull(count(ei.ITEM_STATE = '5' or null),0) as unresolvedTotal,
+        ifnull(round(ifnull(count(ei.ITEM_STATE = '5' or null),0) / ifnull(count(ei.ITEM_STATE = '10' or ei.ITEM_STATE = '5' or null),0) * 100),0)  as unresolvedRatio,
+
+        ifnull(count(ei.ITEM_STATE = '10' and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as resolvedIncr,
+        ifnull(count(ei.ITEM_STATE = '5' and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as unresolvedIncr,
+
+        ifnull(count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as projectIncr,
+        ifnull(count(ei.ITEM_STATE = '0' and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as pendingIncr,
+        ifnull(count((ei.ITEM_STATE = '10' or ei.ITEM_STATE = '5') and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as closedIncr
+
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_events.epdc_item ei  on ei.GRID_ID = grid.id and ei.DEL_FLAG ='0'
+        where grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        group by grid.id
+    </select>
+    <select id="selectCommunityProjectList"
+            resultType="com.elink.esua.epdc.dto.screen.result.CommunityProjectResultDTO">
+
+
+        select
+        community.id as agencyId,
+        community.pid  as parentId,
+        #{customId}                                                                                            as customerId,
+        DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as dateId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'W',
+        WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y')       AS yearId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'Q',
+        QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
+        '%Y-%m-%d')))                                                                 quarterId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId,
+        ifnull(count(ei.ID),0) as projectTotal,
+        ifnull(count(ei.ITEM_STATE = '0' or null),0) as pendingTotal,
+        ifnull(round(ifnull(count(ei.ITEM_STATE = '0' or null),0) / ifnull(count(ei.ID),0) * 100),0)  as pendingRatio,
+
+        ifnull(count(ei.ITEM_STATE = '10' or ei.ITEM_STATE = '5' or null),0) as closedTotal,
+        ifnull(round(ifnull(count(ei.ITEM_STATE = '10' or ei.ITEM_STATE = '5' or null),0) / ifnull(count(ei.ID),0) * 100),0)  as closedRatio,
+
+        ifnull(count(ei.ITEM_STATE = '10' or null),0) as resolvedTotal,
+        ifnull(round(ifnull(count(ei.ITEM_STATE = '10' or null),0) / ifnull(count(ei.ITEM_STATE = '10' or ei.ITEM_STATE = '5' or null),0) * 100),0)  as resolvedRatio,
+
+
+        ifnull(count(ei.ITEM_STATE = '5' or null),0) as unresolvedTotal,
+        ifnull(round(ifnull(count(ei.ITEM_STATE = '5' or null),0) / ifnull(count(ei.ITEM_STATE = '10' or ei.ITEM_STATE = '5' or null),0) * 100),0)  as unresolvedRatio,
+
+        ifnull(count(ei.ITEM_STATE = '10' and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as resolvedIncr,
+        ifnull(count(ei.ITEM_STATE = '5' and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as unresolvedIncr,
+
+        ifnull(count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as projectIncr,
+        ifnull(count(ei.ITEM_STATE = '0' and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as pendingIncr,
+        ifnull(count((ei.ITEM_STATE = '10' or ei.ITEM_STATE = '5') and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0) as closedIncr
+
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_admin.sys_dept community on grid.pid = community.id
+        left join esua_epdc_events.epdc_item ei  on ei.GRID_ID = grid.id and ei.DEL_FLAG ='0'
+        where grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and community.del_flag = '0'
+        and community.type_key = 'community_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        group by community.id
+    </select>
+    <select id="selectGridGroupTotalList"
+            resultType="com.elink.esua.epdc.dto.screen.result.GridGroupTotalResultDTO">
+
+        select grid.id                                                                                              as gridId,
+       grid.pid                                                                                             as agencyId,
+       #{customId}                                                                                                   as customerId,
+       DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                            as dateId,
+       CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+              'W',
+              WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d')))        weekId,
+       DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y')      AS yearId,
+       CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+              'Q',
+              QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
+                                  '%Y-%m-%d')))                                                                quarterId,
+       DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId,
+       ifnull(community.groupTotal,0) as groupTotal,
+       ifnull(community.ordinaryTotal,0) as ordinaryTotal,
+       ifnull(community.branchTotal,0) as branchTotal
+from esua_epdc_admin.sys_dept grid
+         left join
+
+     (
+         select community.id as communityId,
+                count(eg.ID) as groupTotal,
+                count(eg.ID) as ordinaryTotal,
+                0            as branchTotal
+         from esua_epdc_admin.sys_dept community
+                  left join esua_epdc_party_group.epdc_party_group eg
+                            on eg.`DEPT_ID` = community.id and eg.DEL_FLAG = '0'
+         where community.del_flag = '0'
+           and community.type_key = 'community_party'
+           and community.id not in
+               (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
+           and DATE_FORMAT(eg.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+         group by community.id) community on community.communityId = grid.pid
+where grid.del_flag = '0'  and grid.type_key = 'grid_party'
+and grid.id not in
+               (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
+
+    </select>
+    <select id="selectCommunityGroupTotalList"
+            resultType="com.elink.esua.epdc.dto.screen.result.CommunityGroupTotalResultDTO">
+
+select
+        community.id as agencyId,
+        community.pid  as pid,
+        #{customId}                                                                                            as customerId,
+        DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as dateId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'W',
+        WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y')       AS yearId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'Q',
+        QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
+        '%Y-%m-%d')))                                                                 quarterId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId,
+        count(eg.ID) as groupTotal,
+        count(eg.ID) as ordinaryTotal,
+        0 as branchTotal
+        from esua_epdc_admin.sys_dept community
+        left join `esua_epdc_party_group`.`epdc_party_group`  eg  on eg.DEPT_ID = community.id and eg.DEL_FLAG ='0'
+        where
+        community.del_flag = '0'
+        and community.type_key = 'community_party'
+        and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        and DATE_FORMAT(eg.CREA
+    </select>
+
 </mapper>