diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
index 99637cd52..499eedf84 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
@@ -111,7 +111,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
     public void save(SysRoleDTO dto) {
         SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
 
-        checkDeptRoleAmount(dto.getTypeKey(), dto.getDeptIdList());
+        //checkDeptRoleAmount(dto.getTypeKey(), dto.getDeptIdList());
 
         //保存角色
         insert(entity);
@@ -170,7 +170,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
     @Transactional(rollbackFor = Exception.class)
     public void update(SysRoleDTO dto) {
         SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
-        checkDeptRoleAmount(dto.getTypeKey(), dto.getDeptIdList());
+        //checkDeptRoleAmount(dto.getTypeKey(), dto.getDeptIdList());
         //更新角色
         updateById(entity);
 
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java
new file mode 100644
index 000000000..ee3283601
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CpcbasedataDTO.java
@@ -0,0 +1,82 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 党员基本情况
+ * @author: wangtong
+ * @create: 2020-08-19 13:58
+ **/
+@Data
+public class CpcbasedataDTO implements Serializable {
+
+    private static final long serialVersionUID = 7240758113851172699L;
+
+    /**
+     *组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     *组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     *上级组织Id
+     */
+    private String parentId;
+
+    /**
+     *组织名称
+     */
+    private String orgName;
+
+    /**
+     *注册用户数
+     */
+    private Integer registerUserCount;
+
+    /**
+     *群众用户数
+     */
+    private Integer resiTotal;
+
+    /**
+     *注册党员数
+     */
+    private Integer partyMemberCount;
+
+    /**
+     *小于20岁
+     */
+    private Integer ageLevel1;
+
+    /**
+     *20-30岁
+     */
+    private Integer ageLevel2;
+
+    /**
+     *31-40岁
+     */
+    private Integer ageLevel3;
+
+    /**
+     *41-50岁
+     */
+    private Integer ageLevel4;
+
+    /**
+     *51-60岁
+     */
+    private Integer ageLevel5;
+
+    /**
+     *60+岁
+     */
+    private Integer ageLevel6;
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomeragencyResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomeragencyResultDTO.java
new file mode 100644
index 000000000..475d12a6a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomeragencyResultDTO.java
@@ -0,0 +1,74 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 组织层级
+ * @author: wangtong
+ * @create: 2020-08-21 18:14
+ **/
+@Data
+public class CustomeragencyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2415663167177454669L;
+
+    /**
+     *组织id
+     */
+    private String agencyId;
+
+    /**
+     *组织名称
+     */
+    private String agencyName;
+
+    /**
+     *父级id ,顶级，此列为0
+     */
+    private String pid;
+
+    /**
+     *所有上级ID，用逗号分开
+     */
+    private String pids;
+
+    /**
+     *所有组织名称以-链接
+     */
+    private String allParentNames;
+
+    /**
+     *坐标区域
+     */
+    private String areaMarks;
+
+    /**
+     *中心点位
+     */
+    private String centerMark;
+
+    /**
+     *党工委|街道党委的位置，预留字段
+     */
+    private String partyMark;
+
+    /**
+     *机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
+     */
+    private String level;
+
+    /**
+     *行政地区编码
+     */
+    private String areaCode;
+
+    /**
+     *数据更新至: yyyy|yyyyMM|yyyyMMdd
+     */
+    private String dataEndTime;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomergridResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomergridResultDTO.java
new file mode 100644
index 000000000..5fe145e49
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CustomergridResultDTO.java
@@ -0,0 +1,52 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 网格信息上传
+ * @author: wangtong
+ * @create: 2020-08-21 18:11
+ **/
+@Data
+public class CustomergridResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8040800736309043807L;
+
+    /**
+     *网格id
+     */
+    private String gridId;
+
+    /**
+     *网格名称
+     */
+    private String gridName;
+
+    /**
+     *网格所属组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     *坐标区域可空
+     */
+    private String areaMarks;
+
+    /**
+     *中心点位可空
+     */
+    private String centerMark;
+
+    /**
+     *党支部的位置！！！
+     */
+    private String partyMark;
+
+    /**
+     *数据更新至: yyyy|yyyyMM|yyyyMMdd
+     */
+    private String dataEndTime;
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DataStatsScreencollResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DataStatsScreencollResultDTO.java
new file mode 100644
index 000000000..e6fb5714b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DataStatsScreencollResultDTO.java
@@ -0,0 +1,18 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 大屏展示
+ * @author: wangtong
+ * @create: 2020-08-19 13:46
+ **/
+@Data
+public class DataStatsScreencollResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -83110725240264840L;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataImgListDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataImgListDTO.java
new file mode 100644
index 000000000..60a3121cf
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataImgListDTO.java
@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 事件数据-图片列表
+ * @author: wangtong
+ * @create: 2020-08-20 13:38
+ **/
+@Data
+public class EventdataImgListDTO implements Serializable {
+
+    private static final long serialVersionUID = -5661511223100857441L;
+
+    /**
+     * 原始事件id
+     */
+    private String eventId;
+
+    /**
+     * 图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataResultDTO.java
new file mode 100644
index 000000000..ed71568a1
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventdataResultDTO.java
@@ -0,0 +1,121 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description: 事件数据
+ * @author: wangtong
+ * @create: 2020-08-20 11:20
+ **/
+@Data
+public class EventdataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3736021322966785928L;
+
+    /**
+     *组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     *组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     *上级组织Id
+     */
+    private String parentId;
+
+    /**
+     *组织名称
+     */
+    private String orgName;
+
+    /**
+     *原始事件Id
+     */
+    private String eventId;
+
+    /**
+     *事件名称
+     */
+    private String eventTitle;
+
+    /**
+     *yyyy-MM-dd HH:mm:ss事件时间
+     */
+    private String eventCreateTime;
+
+    /**
+     *联系人
+     */
+    private String linkMobile;
+
+    /**
+     *事件内容
+     */
+    private String eventContent;
+
+    /**
+     *事件图片（如果有图片，此列为第一张图片）
+     */
+    private String eventImgUrl;
+
+    /**
+     *事件待处理级别 red:红；yellow：黄 , green绿色
+     */
+    private String eventLevel;
+
+    /**
+     *事件发生的地址
+     */
+    private String eventAddress;
+
+    /**
+     *经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     *纬度
+     */
+    private BigDecimal latitude;
+
+    /**
+     *最后处理的组织名称
+     */
+    private String lastProcessDept;
+
+    /**
+     *最后处理的时间
+     */
+    private String lastProcessDate;
+
+    /**
+     * 图片列表
+     */
+    private List<EventdataImgListDTO> imgDataList;
+
+    /**
+     *事件状态描述
+     */
+    private String eventStatusDesc;
+
+    /**
+     *事件状态key
+     */
+    private String eventStatusCode;
+
+    /**
+     *最近一次操作说明 eg: 转项目，结案，流转
+     */
+    private String latestOperateDesc;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/MeetdataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/MeetdataResultDTO.java
new file mode 100644
index 000000000..e85c8059a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/MeetdataResultDTO.java
@@ -0,0 +1,77 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 基层党建-建设情况数据（支部、联建、志愿）
+ * @author: wangtong
+ * @create: 2020-08-20 13:58
+ **/
+@Data
+public class MeetdataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 7240758113851172699L;
+
+    /**
+     * 年Id:yyyy
+     */
+    private String yearId;
+
+    /**
+     * 月id:yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * 数据类别 party:支部建设;union:联合建设党员志愿服务：voluntaryservice
+     */
+    private String type;
+
+    /**
+     * 组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     * 组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     * 上级组织Id,顶级组织默认是0
+     */
+    private String parentId;
+
+    /**
+     * 组织名称
+     */
+    private String orgName;
+
+    /**
+     * 会议分类名称
+     */
+    private String meetCategoryName;
+
+    /**
+     * 会议分类id
+     */
+    private String meetCategoryId;
+
+    /**
+     * 组织次数
+     */
+    private Integer organizeCount;
+
+    /**
+     * 参加人数
+     */
+    private Integer joinUserCount;
+
+    /**
+     * 平均参加人数
+     */
+    private Integer averageJoinUserCount;
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataResultDTO.java
new file mode 100644
index 000000000..0d515bd55
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PartylinkmassesdataResultDTO.java
@@ -0,0 +1,47 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 党建引领-党员联系群众数据
+ * @author: wangtong
+ * @create: 2020-08-20 14:25
+ **/
+@Data
+public class PartylinkmassesdataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4303651299312624786L;
+
+    /**
+     *组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     *组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     *上级组织Id
+     */
+    private String parentId;
+
+    /**
+     *组织名称
+     */
+    private String orgName;
+
+    /**
+     *建群总数
+     */
+    private Integer createGroupTotal;
+
+    /**
+     *群成员总数
+     */
+    private Integer groupUserTotal;
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java
new file mode 100644
index 000000000..06e21a3c9
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java
@@ -0,0 +1,63 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 党建引领-先锋模范数据
+ * @author: wangtong
+ * @create: 2020-08-20 18:03
+ **/
+@Data
+public class PioneerdataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4681354998669289322L;
+
+    /**
+     *组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     *组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     *上级组织Id
+     */
+    private String parentId;
+
+    /**
+     *组织名称
+     */
+    private String orgName;
+
+    /**
+     *用户总数
+     */
+    private Integer userTotal;
+
+    /**
+     *议事数
+     */
+    private Integer issueTotal;
+
+    /**
+     *话题总数
+     */
+    private Integer topicTotal;
+
+    /**
+     *议题转项目数
+     */
+    private Integer shiftProjectTotal;
+
+    /**
+     *解决项目总数
+     */
+    private Integer resolvedProjectTotal;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataResultDTO.java
new file mode 100644
index 000000000..ea835584e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UsertotaldataResultDTO.java
@@ -0,0 +1,67 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 中央区各类总数
+ * @author: wangtong
+ * @create: 2020-08-21 10:34
+ **/
+@Data
+public class UsertotaldataResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4308356025431997272L;
+
+    /**
+     *组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     *组织Id 可以为网格，机关id
+     */
+    private String orgId;
+
+    /**
+     *上级组织Id
+     */
+    private String parentId;
+
+    /**
+     *组织名称
+     */
+    private String orgName;
+
+    /**
+     *用户总数
+     */
+    private Integer userTotal;
+
+    /**
+     *注册党员数
+     */
+    private Integer partyTotal;
+
+    /**
+     *小组（党群）总数
+     */
+    private Integer groupTotal;
+
+    /**
+     *议事数
+     */
+    private Integer issueTotal;
+
+    /**
+     *话题总数
+     */
+    private Integer topicTotal;
+
+    /**
+     *项目总数
+     */
+    private Integer projectTotal;
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java
new file mode 100644
index 000000000..59a21dae4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/DataStatsScreencollController.java
@@ -0,0 +1,120 @@
+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.DataStatsScreencollService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 大屏展示相关
+ *
+ * @author wangtong
+ * @since 2020-08-19
+ */
+@RestController
+@RequestMapping("data/stats/screencoll")
+public class DataStatsScreencollController {
+
+    @Autowired
+    private DataStatsScreencollService dataStatsScreencollService;
+
+    /**
+    * @describe: 党员基本情况
+    * @author wangtong
+    * @date 2020/8/19 17:25
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO>
+    */
+    @PostMapping("cpcbasedata")
+    public Result cpcbasedata() {
+        return dataStatsScreencollService.cpcbasedata();
+    }
+
+    /**
+    * @describe: 事件数据
+    * @author wangtong
+    * @date 2020/8/20 11:19
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("eventdata")
+    public Result eventdata() {
+        return dataStatsScreencollService.eventdata();
+    }
+
+    
+    /**
+    * @describe: 党建引领-党员联系群众数据
+    * @author wangtong
+    * @date 2020/8/20 14:25
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("partylinkmassesdata")
+    public Result partylinkmassesdata() {
+        return dataStatsScreencollService.partylinkmassesdata();
+    }
+
+    /**
+    * @describe: 党建引领-先锋模范数据
+    * @author wangtong
+    * @date 2020/8/20 18:02
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("pioneerdata")
+    public Result pioneerdata() {
+        return dataStatsScreencollService.pioneerdata();
+    }
+
+    /**
+    * @describe: 中央区各类总数
+    * @author wangtong
+    * @date 2020/8/21 10:32
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("usertotaldata")
+    public Result usertotaldata() {
+        return dataStatsScreencollService.usertotaldata();
+    }
+
+
+    /**
+    * @describe: 基层党建-建设情况数据（支部、联建、志愿）
+    * @author wangtong
+    * @date 2020/8/21 18:01
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("meetdata")
+    public Result meetdata() {
+        return dataStatsScreencollService.meetdata();
+    }
+
+    /**
+    * @describe: 网格信息上传
+    * @author wangtong
+    * @date 2020/8/21 18:09
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("customergrid")
+    public Result customergrid() {
+        return dataStatsScreencollService.customergrid();
+    }
+
+    /**
+    * @describe: 组织层级
+    * @author wangtong
+    * @date 2020/8/21 18:19
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("customeragency")
+    public Result customeragency() {
+        return dataStatsScreencollService.customeragency();
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java
new file mode 100644
index 000000000..ae07cc931
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/DataStatsScreencollDao.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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 java.util.List;
+
+/**
+ * @Description 大屏展示
+ * @Author wangtong
+ * @Date 2020/08/19 13:43
+ */
+@Mapper
+public interface DataStatsScreencollDao extends BaseDao<DataStatsScreencollResultDTO> {
+
+    /**
+    * @describe: 党员基本情况
+    * @author wangtong
+    * @date 2020/8/19 17:21
+    * @params []
+    * @return com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO
+    */
+    List<CpcbasedataDTO> cpcbasedata();
+
+    /**
+    * @describe: 事件数据
+    * @author wangtong
+    * @date 2020/8/20 13:41
+    * @params []
+    * @return com.elink.esua.epdc.dto.screen.result.EventdataResultDTO
+    */
+    List<EventdataResultDTO> eventdata();
+
+    /**
+    * @describe: 党建引领-党员联系群众数据
+    * @author wangtong
+    * @date 2020/8/20 14:34
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.PartylinkmassesdataResultDTO>
+    */
+    List<PartylinkmassesdataResultDTO> partylinkmassesdata();
+
+    /**
+    * @describe: 党建引领-先锋模范数据
+    * @author wangtong
+    * @date 2020/8/20 18:05
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.PioneerdataResultDTO>
+    */
+    List<PioneerdataResultDTO> pioneerdata();
+
+    /**
+    * @describe: 
+    * @author wangtong
+    * @date 2020/8/21 10:38
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.UsertotaldataResultDTO>
+    */
+    List<UsertotaldataResultDTO> usertotaldata();
+
+    /**
+    * @describe: 基层党建-建设情况数据（支部、联建、志愿）
+    * @author wangtong
+    * @date 2020/8/21 18:03
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.MeetdataResultDTO>
+    */
+    List<MeetdataResultDTO> meetdata();
+
+    /**
+    * @describe: 网格信息上传
+    * @author wangtong
+    * @date 2020/8/21 18:18
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.CustomergridResultDTO>
+    */
+    List<CustomergridResultDTO> customergrid();
+
+    /**
+    * @describe: 组织层级
+    * @author wangtong
+    * @date 2020/8/21 18:21
+    * @params []
+    * @return java.util.List<com.elink.esua.epdc.dto.screen.result.CustomeragencyResultDTO>
+    */
+    List<CustomeragencyResultDTO> customeragency();
+}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java
new file mode 100644
index 000000000..9b83c2430
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/DataStatsScreencollService.java
@@ -0,0 +1,86 @@
+package com.elink.esua.epdc.modules.screen.service;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO;
+
+/**
+ * 项目模块
+ *
+ * @Author wanttong
+ * @Date 2020/08/19 13:43
+ */
+public interface DataStatsScreencollService {
+
+
+    /**
+    * @describe: 党员基本情况
+    * @author wangtong
+    * @date 2020/8/19 13:53
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result<CpcbasedataDTO> cpcbasedata();
+
+    /**
+    * @describe: 事件数据
+    * @author wangtong
+    * @date 2020/8/20 11:19
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result eventdata();
+
+    /**
+    * @describe: 党建引领-党员联系群众数据
+    * @author wangtong
+    * @date 2020/8/20 14:25
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result partylinkmassesdata();
+
+    /**
+    * @describe: 党建引领-先锋模范数据
+    * @author wangtong
+    * @date 2020/8/20 18:03
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result pioneerdata();
+
+    /**
+    * @describe: 中央区各类总数
+    * @author wangtong
+    * @date 2020/8/21 10:33
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result usertotaldata();
+
+    /**
+    * @describe: 基层党建-建设情况数据（支部、联建、志愿）
+    * @author wangtong
+    * @date 2020/8/21 18:01
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result meetdata();
+
+    /**
+    * @describe: 网格信息上传
+    * @author wangtong
+    * @date 2020/8/21 18:10
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result customergrid();
+
+    /**
+    * @describe: 组织层级
+    * @author wangtong
+    * @date 2020/8/21 18:20
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result customeragency();
+}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java
new file mode 100644
index 000000000..ab847a280
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java
@@ -0,0 +1,79 @@
+package com.elink.esua.epdc.modules.screen.service.impl;
+
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.screen.result.*;
+import com.elink.esua.epdc.modules.screen.dao.DataStatsScreencollDao;
+import com.elink.esua.epdc.modules.screen.service.DataStatsScreencollService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description 大屏展示相关
+ * @Author wangtong
+ * @Date 2020/08/19 13:43
+ */
+@Service
+public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScreencollDao, DataStatsScreencollResultDTO> implements DataStatsScreencollService {
+
+	private Logger logger = LoggerFactory.getLogger(getClass());
+
+
+
+	@Override
+	public Result<CpcbasedataDTO> cpcbasedata() {
+		List<CpcbasedataDTO> result = baseDao.cpcbasedata();
+		return null;
+	}
+
+	@Override
+	public Result eventdata() {
+		List<EventdataResultDTO> resultList = baseDao.eventdata();
+		for(EventdataResultDTO re : resultList){
+			for(int x = 0;x < re.getImgDataList().size();x++){
+				re.getImgDataList().get(x).setEventId(re.getEventId());
+				re.getImgDataList().get(x).setSort(x+1);
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public Result partylinkmassesdata() {
+		List<PartylinkmassesdataResultDTO> resultList = baseDao.partylinkmassesdata();
+		return null;
+	}
+
+	@Override
+	public Result pioneerdata() {
+		List<PioneerdataResultDTO> resultList = baseDao.pioneerdata();
+		return null;
+	}
+
+	@Override
+	public Result usertotaldata() {
+		List<UsertotaldataResultDTO> resultList = baseDao.usertotaldata();
+		return null;
+	}
+
+	@Override
+	public Result meetdata() {
+		List<MeetdataResultDTO> resultList = baseDao.meetdata();
+		return null;
+	}
+
+	@Override
+	public Result customergrid() {
+		List<CustomergridResultDTO> resultList = baseDao.customergrid();
+		return null;
+	}
+
+	@Override
+	public Result customeragency() {
+		List<CustomeragencyResultDTO> resultList = baseDao.customeragency();
+		return null;
+	}
+}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml
new file mode 100644
index 000000000..dd3bf7f93
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/DataStatsScreencollDao.xml
@@ -0,0 +1,1680 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.screen.dao.DataStatsScreencollDao">
+
+    <select id="cpcbasedata" resultType="com.elink.esua.epdc.dto.screen.result.CpcbasedataDTO">
+        SELECT
+                total.orgId,
+                total.orgName,
+                total.parentId,
+                'grid' as orgType,
+                SUM( total.USER_TOTAL) AS USER_TOTAL,
+                SUM( total.RESIDENTS_TOTAL ) AS RESIDENTS_TOTAL,
+                SUM( total.PARTY_TOTAL ) AS PARTY_TOTAL,
+                SUM( total.ageLevel1 ) AS ageLevel1,
+                SUM( total.ageLevel2 ) AS ageLevel2,
+                SUM( total.ageLevel3 ) AS ageLevel3,
+                SUM( total.ageLevel4 ) AS ageLevel4,
+                SUM( total.ageLevel5 ) AS ageLevel5,
+                SUM( total.ageLevel6 ) AS ageLevel6
+            FROM
+                (SELECT
+                        t1.orgId,
+                        d.name as orgName,
+                        d.pid as parentId,
+                        t1.USER_TOTAL,
+                        IFNULL(( t1.USER_TOTAL - t1.PARTY_TOTAL ),0) AS RESIDENTS_TOTAL,
+                        t1.PARTY_TOTAL,
+                        t1.ageLevel1,
+                        t1.ageLevel2,
+                        t1.ageLevel3,
+                        t1.ageLevel4,
+                        t1.ageLevel5,
+                        t1.ageLevel6
+                    FROM
+                        (SELECT
+                                        t.orgId,
+                                        COUNT( t.ID ) AS USER_TOTAL,
+                                        count(  t.PARTY_FLAG = '1' OR NULL ) AS PARTY_TOTAL,
+                                        count( ( t.age <![CDATA[<]]> 20 AND t.PARTY_FLAG = '1' ) OR NULL ) AS ageLevel1,
+                                        count( ( 20 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 30 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel2,
+                                        count( ( 31 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 40 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel3,
+                                        count( ( 41 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 50 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel4,
+                                        count( ( 51 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 60 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel5,
+                                        count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
+                                    FROM
+                                        (SELECT
+                                                e.ID,
+                                                e.PARTY_FLAG,
+                                                IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
+                                                d.id as orgId
+                                            FROM
+                                            esua_epdc_admin.sys_dept d
+                                            left join (select eu.id,
+                                                                    eu.BIRTHDAY,
+                                                                    (select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+                                                                         SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+                                                                         WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+                                                                         ORDER BY
+                                                                             CREATED_TIME,id
+                                                                         LIMIT 1 )
+                                                                )) AS orgId,
+                                                                eu.PARTY_FLAG
+                                                        from esua_epdc_user.epdc_user eu
+                                                        where eu.DEL_FLAG = '0' )e on d.id=e.orgId
+                                            WHERE
+                                                d.DEL_FLAG = '0'
+                                                and d.type_key='grid_party'
+                                                 and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+            '1191535697380884481','1192004624745586689','1230704850994528257',
+            '1201319745506598913','1201687651826360321','1201689212329746433')
+                                        ) t
+                                    GROUP BY
+                                        t.orgId
+                        ) t1
+                        left join esua_epdc_admin.sys_dept d on d.id=t1.orgId
+              ) total
+            GROUP BY
+                total.orgId
+
+            union all
+
+
+            SELECT
+                total.orgId,
+                total.orgName,
+                total.parentId,
+                'department' as orgType,
+                SUM( total.USER_TOTAL) AS USER_TOTAL,
+                SUM( total.RESIDENTS_TOTAL ) AS RESIDENTS_TOTAL,
+                SUM( total.PARTY_TOTAL ) AS PARTY_TOTAL,
+                SUM( total.ageLevel1 ) AS ageLevel1,
+                SUM( total.ageLevel2 ) AS ageLevel2,
+                SUM( total.ageLevel3 ) AS ageLevel3,
+                SUM( total.ageLevel4 ) AS ageLevel4,
+                SUM( total.ageLevel5 ) AS ageLevel5,
+                SUM( total.ageLevel6 ) AS ageLevel6
+            FROM
+                (SELECT
+                        t1.orgId,
+                        d.name as orgName,
+                        d.pid as parentId,
+                        t1.USER_TOTAL,
+                        IFNULL(( t1.USER_TOTAL - t1.PARTY_TOTAL ),0) AS RESIDENTS_TOTAL,
+                        t1.PARTY_TOTAL,
+                        t1.ageLevel1,
+                        t1.ageLevel2,
+                        t1.ageLevel3,
+                        t1.ageLevel4,
+                        t1.ageLevel5,
+                        t1.ageLevel6
+                    FROM
+                        (SELECT
+                                        t.orgId,
+                                        COUNT( t.ID ) AS USER_TOTAL,
+                                        count(  t.PARTY_FLAG = '1' OR NULL ) AS PARTY_TOTAL,
+                                        count( ( t.age <![CDATA[<]]> 20 AND t.PARTY_FLAG = '1' ) OR NULL ) AS ageLevel1,
+                                        count( ( 20 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 30 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel2,
+                                        count( ( 31 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 40 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel3,
+                                        count( ( 41 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 50 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel4,
+                                        count( ( 51 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 60 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel5,
+                                        count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
+                                    FROM
+                                        (SELECT
+                                                e.ID,
+                                                e.PARTY_FLAG,
+                                                IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
+                                                co.id AS orgId
+                                            FROM
+                                            esua_epdc_admin.sys_dept co
+                                            left join esua_epdc_admin.sys_dept gr on gr.pid=co.id
+                                            left join (select eu.id,
+                                                                eu.BIRTHDAY,
+                                                                (select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+                                                                     SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+                                                                     WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+                                                                     ORDER BY
+                                                                         CREATED_TIME,id
+                                                                     LIMIT 1 )
+                                                            )) AS orgId,
+                                                            eu.PARTY_FLAG
+                                                    from esua_epdc_user.epdc_user eu
+                                                    where eu.DEL_FLAG = '0' )e on gr.id=e.orgId
+                                            WHERE
+                                                co.DEL_FLAG = '0'
+                                                and gr.DEL_FLAG = '0'
+                                                and co.type_key='community_party'
+                                                and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+            '1191535697380884481','1192004624745586689','1230704850994528257',
+            '1201319745506598913','1201687651826360321','1201689212329746433')
+                                        ) t
+                                    GROUP BY
+                                        t.orgId
+                        ) t1
+                        left join esua_epdc_admin.sys_dept d on d.id=t1.orgId
+              ) total
+            GROUP BY
+                total.orgId
+
+
+            union all
+
+            SELECT
+                total.orgId,
+                total.orgName,
+                total.parentId,
+                'department' as orgType,
+                SUM( total.USER_TOTAL) AS USER_TOTAL,
+                SUM( total.RESIDENTS_TOTAL ) AS RESIDENTS_TOTAL,
+                SUM( total.PARTY_TOTAL ) AS PARTY_TOTAL,
+                SUM( total.ageLevel1 ) AS ageLevel1,
+                SUM( total.ageLevel2 ) AS ageLevel2,
+                SUM( total.ageLevel3 ) AS ageLevel3,
+                SUM( total.ageLevel4 ) AS ageLevel4,
+                SUM( total.ageLevel5 ) AS ageLevel5,
+                SUM( total.ageLevel6 ) AS ageLevel6
+            FROM
+                (SELECT
+                        t1.orgId,
+                        d.name as orgName,
+                        d.pid as parentId,
+                        t1.USER_TOTAL,
+                        IFNULL(( t1.USER_TOTAL - t1.PARTY_TOTAL ),0) AS RESIDENTS_TOTAL,
+                        t1.PARTY_TOTAL,
+                        t1.ageLevel1,
+                        t1.ageLevel2,
+                        t1.ageLevel3,
+                        t1.ageLevel4,
+                        t1.ageLevel5,
+                        t1.ageLevel6
+                    FROM
+                        (SELECT
+                                        t.orgId,
+                                        COUNT( t.ID ) AS USER_TOTAL,
+                                        count(  t.PARTY_FLAG = '1' OR NULL ) AS PARTY_TOTAL,
+                                        count( ( t.age <![CDATA[<]]> 20 AND t.PARTY_FLAG = '1' ) OR NULL ) AS ageLevel1,
+                                        count( ( 20 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 30 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel2,
+                                        count( ( 31 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 40 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel3,
+                                        count( ( 41 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 50 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel4,
+                                        count( ( 51 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 60 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel5,
+                                        count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
+                                    FROM
+                                        (SELECT
+                                                e.ID,
+                                                e.PARTY_FLAG,
+                                                IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
+                                                st.id AS orgId
+                                            FROM
+                                            esua_epdc_admin.sys_dept st
+                                            left join esua_epdc_admin.sys_dept co on co.pid=st.id
+                                            left join esua_epdc_admin.sys_dept gr on gr.pid=co.id
+                                            left join (select eu.id,
+                                                                eu.BIRTHDAY,
+                                                                (select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+                                                                     SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+                                                                     WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+                                                                     ORDER BY
+                                                                         CREATED_TIME,id
+                                                                     LIMIT 1 )
+                                                            )) AS orgId,
+                                                            eu.PARTY_FLAG
+                                                    from esua_epdc_user.epdc_user eu
+                                                    where eu.DEL_FLAG = '0' )e on gr.id=e.orgId
+                                            WHERE
+                                                st.DEL_FLAG = '0'
+                                                and co.DEL_FLAG = '0'
+                                                and gr.DEL_FLAG = '0'
+                                                and st.type_key='street_party'
+                                                 and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+            '1191535697380884481','1192004624745586689','1230704850994528257',
+            '1201319745506598913','1201687651826360321','1201689212329746433')
+                                        ) t
+                                    GROUP BY
+                                        t.orgId
+                        ) t1
+                        left join esua_epdc_admin.sys_dept d on d.id=t1.orgId
+              ) total
+            GROUP BY
+                total.orgId
+
+
+            union all
+
+
+            SELECT
+                total.orgId,
+                total.orgName,
+                total.parentId,
+                'department' as orgType,
+                SUM( total.USER_TOTAL) AS USER_TOTAL,
+                SUM( total.RESIDENTS_TOTAL ) AS RESIDENTS_TOTAL,
+                SUM( total.PARTY_TOTAL ) AS PARTY_TOTAL,
+                SUM( total.ageLevel1 ) AS ageLevel1,
+                SUM( total.ageLevel2 ) AS ageLevel2,
+                SUM( total.ageLevel3 ) AS ageLevel3,
+                SUM( total.ageLevel4 ) AS ageLevel4,
+                SUM( total.ageLevel5 ) AS ageLevel5,
+                SUM( total.ageLevel6 ) AS ageLevel6
+            FROM
+                (SELECT
+                        t1.orgId,
+                        d.name as orgName,
+                        d.pid as parentId,
+                        t1.USER_TOTAL,
+                        IFNULL(( t1.USER_TOTAL - t1.PARTY_TOTAL ),0) AS RESIDENTS_TOTAL,
+                        t1.PARTY_TOTAL,
+                        t1.ageLevel1,
+                        t1.ageLevel2,
+                        t1.ageLevel3,
+                        t1.ageLevel4,
+                        t1.ageLevel5,
+                        t1.ageLevel6
+                    FROM
+                        (SELECT
+                                        t.orgId,
+                                        COUNT( t.ID ) AS USER_TOTAL,
+                                        count(  t.PARTY_FLAG = '1' OR NULL ) AS PARTY_TOTAL,
+                                        count( ( t.age <![CDATA[<]]> 20 AND t.PARTY_FLAG = '1' ) OR NULL ) AS ageLevel1,
+                                        count( ( 20 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 30 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel2,
+                                        count( ( 31 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 40 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel3,
+                                        count( ( 41 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 50 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel4,
+                                        count( ( 51 <![CDATA[<]]>= t.age AND t.age <![CDATA[<]]>= 60 AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel5,
+                                        count( ( 60 <![CDATA[<]]> t.age AND t.PARTY_FLAG = '1') OR NULL ) AS ageLevel6
+                                    FROM
+                                        (SELECT
+                                                e.ID,
+                                                e.PARTY_FLAG,
+                                                IFNULL( TIMESTAMPDIFF( YEAR, e.BIRTHDAY, CURDATE( ) ), 0 ) AS age,
+                                                city.id AS orgId
+                                            FROM
+                                            esua_epdc_admin.sys_dept city
+                                            left join esua_epdc_admin.sys_dept st on st.pid=city.id
+                                            left join esua_epdc_admin.sys_dept co on co.pid=st.id
+                                            left join esua_epdc_admin.sys_dept gr on gr.pid=co.id
+                                            left join (select eu.id,
+                                                                eu.BIRTHDAY,
+                                                                (select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+                                                                     SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+                                                                     WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+                                                                     ORDER BY
+                                                                         CREATED_TIME,id
+                                                                     LIMIT 1 )
+                                                            )) AS orgId,
+                                                            eu.PARTY_FLAG
+                                                    from esua_epdc_user.epdc_user eu
+                                                    where eu.DEL_FLAG = '0' )e on gr.id=e.orgId
+                                            WHERE
+                                                city.DEL_FLAG = '0'
+                                                and st.DEL_FLAG = '0'
+                                                and co.DEL_FLAG = '0'
+                                                and gr.DEL_FLAG = '0'
+                                                and city.type_key='district_party' and city.party_code='shibei'
+                                        ) t
+                                    GROUP BY
+                                        t.orgId
+                        ) t1
+                        left join esua_epdc_admin.sys_dept d on d.id=t1.orgId
+              ) total
+            GROUP BY
+                total.orgId
+
+
+    </select>
+    <resultMap id="eventdata_map" type="com.elink.esua.epdc.dto.screen.result.EventdataResultDTO">
+        <result property="orgId" column="orgId"></result>
+        <result property="orgName" column="orgName"></result>
+        <result property="parentId" column="parentId"></result>
+        <result property="orgType" column="orgType"></result>
+        <result property="eventId" column="eventId"></result>
+        <result property="eventCreateTime" column="eventCreateTime"></result>
+        <result property="linkMobile" column="linkMobile"></result>
+        <result property="eventContent" column="eventContent"></result>
+        <result property="eventImgUrl" column="eventImgUrl"></result>
+        <result property="eventLevel" column="eventLevel"></result>
+        <result property="eventAddress" column="eventAddress"></result>
+        <result property="latitude" column="latitude"></result>
+        <result property="longitude" column="longitude"></result>
+        <result property="lastProcessDate" column="lastProcessDate"></result>
+        <result property="lastProcessDept" column="lastProcessDept"></result>
+        <result property="eventStatusCode" column="eventStatusCode"></result>
+        <result property="eventStatusDesc" column="eventStatusDesc"></result>
+        <result property="latestOperateDesc" column="latestOperateDesc"></result>
+        <collection property="imgDataList" ofType="com.elink.esua.epdc.dto.screen.result.EventdataImgListDTO">
+            <result property="imgUrl" column="imgUrl"></result>
+        </collection>
+    </resultMap>
+    <select id="eventdata" resultMap="eventdata_map">
+        select d.id as orgId,
+			 d.name as orgName,
+			 d.pid as parentId,
+			 if(d.type_key='grid_party','grid','department') as orgType,
+			 ei.EVENT_ID as eventId,
+			 ei.CREATED_TIME as eventCreateTime,
+			 ei.MOBILE as linkMobile,
+			 ei.ITEM_CONTENT as eventContent,
+			 (select IMG_URL from esua_epdc_events.epdc_img i
+				where DEL_FLAG=0 and ei.EVENT_ID=i.REFERENCE_ID order by CREATED_TIME asc,id limit 1) as eventImgUrl,
+				(CASE WHEN TIMESTAMPDIFF(HOUR, ei.CREATED_TIME, now()) <![CDATA[<]]> t.VALID_CLOSE_TIME/2 THEN 'green'
+						 WHEN TIMESTAMPDIFF(HOUR, ei.CREATED_TIME, now()) >= t.VALID_CLOSE_TIME/2
+									and TIMESTAMPDIFF(HOUR, ei.CREATED_TIME, now()) <![CDATA[<]]> t.VALID_CLOSE_TIME THEN 'yellow'
+						 WHEN TIMESTAMPDIFF(HOUR, ei.CREATED_TIME, now()) >= t.VALID_CLOSE_TIME THEN 'red' end) as eventLevel,
+			 ei.ISSUE_ADDRESS as eventAddress,
+			 ei.ISSUE_LATITUDE as latitude,
+			 ei.ISSUE_LONGITUDE as longitude,
+			 (select UPDATED_TIME from esua_epdc_events.epdc_item_handle_process eih
+				where eih.DEL_FLAG=0 and eih.ITEM_ID=ei.ID order by CREATED_TIME desc,id limit 1) as lastProcessDate,
+			 (select HANDLER_DEPT from esua_epdc_events.epdc_item_handle_process eih
+				where eih.DEL_FLAG=0 and eih.ITEM_ID=ei.ID order by CREATED_TIME desc,id limit 1) as lastProcessDept,
+				i.IMG_URL as imgUrl,
+				ei.ITEM_STATE as eventStatusCode,
+				(CASE WHEN ei.ITEM_STATE='0' THEN '处理中'
+							WHEN ei.ITEM_STATE='5' THEN '已关闭'
+							WHEN ei.ITEM_STATE='10' THEN '已结案'END) as eventStatusDesc,
+				(select OUT_HANDLE_ADVICE from esua_epdc_events.epdc_item_handle_process eih
+				where eih.DEL_FLAG=0 and eih.ITEM_ID=ei.ID order by CREATED_TIME desc,id limit 1) as latestOperateDesc
+
+		from esua_epdc_events.epdc_item ei
+		left join esua_epdc_admin.sys_dept d on d.id=ei.GRID_ID
+		left join esua_epdc_events.epdc_img i on ei.EVENT_ID=i.REFERENCE_ID
+		LEFT JOIN esua_epdc_events.epdc_category c ON ei.CATEGORY_CODE = c.CATEGORY_CODE
+		LEFT JOIN esua_epdc_kpi.epdc_kpi_time_limit_item t ON c.id = t.CATEGORY_ID
+		where
+			d.DEL_FLAG = '0'
+			and ei.DEL_FLAG=0
+			and ei.ITEM_STATE=0
+			and i.DEL_FLAG=0
+			and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+		order by ei.CREATED_TIME desc,i.id
+    </select>
+    <select id="partylinkmassesdata" resultType="com.elink.esua.epdc.dto.screen.result.PartylinkmassesdataResultDTO">
+        select  gr.id as orgId,
+				gr.name as orgName,
+				gr.pid as parentId,
+				'grid' as orgType,
+				IFNULL(dg.createGroupTotal,0) AS createGroupTotal,
+				IFNULL(dg.groupUserTotal,0) AS groupUserTotal
+            from esua_epdc_admin.sys_dept gr
+            left join
+                 (select  eg.GRID_ID,
+                                count(eg.id) as createGroupTotal,
+                                sum(group_user.userCount) as groupUserTotal
+                    from esua_epdc_group.epdc_group eg
+                    left join (select  GROUP_ID,
+                                            count(STATE = 10 OR NULL) AS userCount
+                                    from esua_epdc_group.epdc_user_group eu
+                                    where eu.DEL_FLAG=0
+                                    group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id
+                    where eg.DEL_FLAG=0 and eg.STATE=10
+                    group by eg.GRID_ID)dg on dg.GRID_ID=gr.id
+                where gr.del_flag=0 and gr.type_key='grid_party'
+                            and gr.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+        '1191535697380884481','1192004624745586689','1230704850994528257',
+        '1201319745506598913','1201687651826360321','1201689212329746433')
+
+        union all
+
+                select  co.id as orgId,
+                                co.name as orgName,
+                                co.pid as parentId,
+                                'department' as orgType,
+                                sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal,
+                                sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal
+            from esua_epdc_admin.sys_dept co
+            left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
+            left join
+                 (select  eg.GRID_ID,
+                                count(eg.id) as createGroupTotal,
+                                sum(group_user.userCount) as groupUserTotal
+                    from esua_epdc_group.epdc_group eg
+                    left join (select  GROUP_ID,
+                                            count(STATE = 10 OR NULL) AS userCount
+                                    from esua_epdc_group.epdc_user_group eu
+                                    where eu.DEL_FLAG=0
+                                    group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id
+                    where eg.DEL_FLAG=0 and eg.STATE=10
+                    group by eg.GRID_ID)dg on dg.GRID_ID=gr.id
+                where gr.del_flag=0
+                            and co.del_flag=0
+                            and co.type_key='community_party'
+                            and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+        '1191535697380884481','1192004624745586689','1230704850994528257',
+        '1201319745506598913','1201687651826360321','1201689212329746433')
+                group by co.id
+
+        union all
+
+                select  st.id as orgId,
+                                st.name as orgName,
+                                st.pid as parentId,
+                                'department' as orgType,
+                                sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal,
+                                sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal
+            from esua_epdc_admin.sys_dept st
+            left join esua_epdc_admin.sys_dept co on st.id=co.pid
+            left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
+            left join
+                 (select  eg.GRID_ID,
+                                count(eg.id) as createGroupTotal,
+                                sum(group_user.userCount) as groupUserTotal
+                    from esua_epdc_group.epdc_group eg
+                    left join (select  GROUP_ID,
+                                            count(STATE = 10 OR NULL) AS userCount
+                                    from esua_epdc_group.epdc_user_group eu
+                                    where eu.DEL_FLAG=0
+                                    group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id
+                    where eg.DEL_FLAG=0 and eg.STATE=10
+                    group by eg.GRID_ID)dg on dg.GRID_ID=gr.id
+                where gr.del_flag=0
+                            and co.del_flag=0
+                            and st.del_flag=0
+                            and st.type_key='street_party'select  gr.id as orgId,
+                        gr.name as orgName,
+                        gr.pid as parentId,
+                        'grid' as orgType,
+                        IFNULL(dg.createGroupTotal,0) AS createGroupTotal,
+                        IFNULL(dg.groupUserTotal,0) AS groupUserTotal
+            from esua_epdc_admin.sys_dept gr
+            left join
+                 (select  eg.GRID_ID,
+                                count(eg.id) as createGroupTotal,
+                                sum(group_user.userCount) as groupUserTotal
+                    from esua_epdc_group.epdc_group eg
+                    left join (select  GROUP_ID,
+                                            count(STATE = 10 OR NULL) AS userCount
+                                    from esua_epdc_group.epdc_user_group eu
+                                    where eu.DEL_FLAG=0
+                                    group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id
+                    where eg.DEL_FLAG=0 and eg.STATE=10
+                    group by eg.GRID_ID)dg on dg.GRID_ID=gr.id
+                where gr.del_flag=0 and gr.type_key='grid_party'
+                            and gr.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+        '1191535697380884481','1192004624745586689','1230704850994528257',
+        '1201319745506598913','1201687651826360321','1201689212329746433')
+
+        union all
+
+                select  co.id as orgId,
+                                co.name as orgName,
+                                co.pid as parentId,
+                                'department' as orgType,
+                                sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal,
+                                sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal
+            from esua_epdc_admin.sys_dept co
+            left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
+            left join
+                 (select  eg.GRID_ID,
+                                count(eg.id) as createGroupTotal,
+                                sum(group_user.userCount) as groupUserTotal
+                    from esua_epdc_group.epdc_group eg
+                    left join (select  GROUP_ID,
+                                            count(STATE = 10 OR NULL) AS userCount
+                                    from esua_epdc_group.epdc_user_group eu
+                                    where eu.DEL_FLAG=0
+                                    group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id
+                    where eg.DEL_FLAG=0 and eg.STATE=10
+                    group by eg.GRID_ID)dg on dg.GRID_ID=gr.id
+                where gr.del_flag=0
+                            and co.del_flag=0
+                            and co.type_key='community_party'
+                            and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+        '1191535697380884481','1192004624745586689','1230704850994528257',
+        '1201319745506598913','1201687651826360321','1201689212329746433')
+                group by co.id
+
+        union all
+
+                select  st.id as orgId,
+                                st.name as orgName,
+                                st.pid as parentId,
+                                'department' as orgType,
+                                sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal,
+                                sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal
+            from esua_epdc_admin.sys_dept st
+            left join esua_epdc_admin.sys_dept co on st.id=co.pid
+            left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
+            left join
+                 (select  eg.GRID_ID,
+                                count(eg.id) as createGroupTotal,
+                                sum(group_user.userCount) as groupUserTotal
+                    from esua_epdc_group.epdc_group eg
+                    left join (select  GROUP_ID,
+                                            count(STATE = 10 OR NULL) AS userCount
+                                    from esua_epdc_group.epdc_user_group eu
+                                    where eu.DEL_FLAG=0
+                                    group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id
+                    where eg.DEL_FLAG=0 and eg.STATE=10
+                    group by eg.GRID_ID)dg on dg.GRID_ID=gr.id
+                where gr.del_flag=0
+                            and co.del_flag=0
+                            and st.del_flag=0
+                            and st.type_key='street_party'
+                            and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+        '1191535697380884481','1192004624745586689','1230704850994528257',
+        '1201319745506598913','1201687651826360321','1201689212329746433')
+                group by st.id
+
+        union all
+
+            select  city.id as orgId,
+                                city.name as orgName,
+                                city.pid as parentId,
+                                'department' as orgType,
+                                sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal,
+                                sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal
+            from esua_epdc_admin.sys_dept city
+            left join esua_epdc_admin.sys_dept st on city.id=st.pid
+            left join esua_epdc_admin.sys_dept co on st.id=co.pid
+            left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
+            left join
+                 (select  eg.GRID_ID,
+                                count(eg.id) as createGroupTotal,
+                                sum(group_user.userCount) as groupUserTotal
+                    from esua_epdc_group.epdc_group eg
+                    left join (select  GROUP_ID,
+                                            count(STATE = 10 OR NULL) AS userCount
+                                    from esua_epdc_group.epdc_user_group eu
+                                    where eu.DEL_FLAG=0
+                                    group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id
+                    where eg.DEL_FLAG=0 and eg.STATE=10
+                    group by eg.GRID_ID)dg on dg.GRID_ID=gr.id
+                where gr.del_flag=0
+                            and co.del_flag=0
+                            and st.del_flag=0
+                            and city.del_flag=0
+                            and city.type_key='district_party' and city.party_code='shibei'
+                group by city.id
+                            and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+        '1191535697380884481','1192004624745586689','1230704850994528257',
+        '1201319745506598913','1201687651826360321','1201689212329746433')
+                group by st.id
+
+        union all
+
+            select  city.id as orgId,
+                                city.name as orgName,
+                                city.pid as parentId,
+                                'department' as orgType,
+                                sum(IFNULL(dg.createGroupTotal,0)) AS createGroupTotal,
+                                sum(IFNULL(dg.groupUserTotal,0)) AS groupUserTotal
+            from esua_epdc_admin.sys_dept city
+            left join esua_epdc_admin.sys_dept st on city.id=st.pid
+            left join esua_epdc_admin.sys_dept co on st.id=co.pid
+            left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
+            left join
+                 (select  eg.GRID_ID,
+                                count(eg.id) as createGroupTotal,
+                                sum(group_user.userCount) as groupUserTotal
+                    from esua_epdc_group.epdc_group eg
+                    left join (select  GROUP_ID,
+                                            count(STATE = 10 OR NULL) AS userCount
+                                    from esua_epdc_group.epdc_user_group eu
+                                    where eu.DEL_FLAG=0
+                                    group by GROUP_ID)group_user on group_user.GROUP_ID = eg.id
+                    where eg.DEL_FLAG=0 and eg.STATE=10
+                    group by eg.GRID_ID)dg on dg.GRID_ID=gr.id
+                where gr.del_flag=0
+                            and co.del_flag=0
+                            and st.del_flag=0
+                            and city.del_flag=0
+                            and city.type_key='district_party' and city.party_code='shibei'
+                group by city.id
+    </select>
+    <select id="pioneerdata" resultType="com.elink.esua.epdc.dto.screen.result.PioneerdataResultDTO">
+        	SELECT gr.id as orgId,
+				 gr.name as orgName,
+				 gr.pid as parentId,
+				'grid' as orgType,
+				 IFNULL(t.userTotal,0) AS userTotal,
+				 IFNULL(t.issueTotal,0) AS issueTotal,
+				 IFNULL(t.topicTotal,0) AS topicTotal,
+				 IFNULL(t.shiftProjectTotal,0) AS shiftProjectTotal,
+				 IFNULL(t.resolvedProjectTotal,0) AS resolvedProjectTotal
+	FROM esua_epdc_admin.sys_dept gr
+	left join
+		(select  total.GRID_ID,
+						sum(total.userTotal) as userTotal,
+						sum(total.issueTotal) as issueTotal,
+						sum(total.topicTotal) as topicTotal,
+						sum(total.shiftProjectTotal) as shiftProjectTotal,
+						sum(total.resolvedProjectTotal) as resolvedProjectTotal
+			from
+			(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+								 SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+								 WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+								 ORDER BY
+									 CREATED_TIME,id
+								 LIMIT 1 )
+						) AS GRID_ID,
+						count(eu.id) as userTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						0 as shiftProjectTotal,
+						0 as resolvedProjectTotal
+				from esua_epdc_user.epdc_user eu
+				where eu.DEL_FLAG=0
+				group by eu.DEPT_ID
+
+		UNION ALL
+
+			select  GRID_ID,
+							0 as userTotal,
+							count(id) as issueTotal,
+							0 as topicTotal,
+							0 as shiftProjectTotal,
+							0 as resolvedProjectTotal
+				from esua_epdc_events.epdc_issue
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+			select GRID_ID,
+							0 as userTotal,
+							0 as issueTotal,
+							count(id) as topicTotal,
+							0 as shiftProjectTotal,
+							0 as resolvedProjectTotal
+				from esua_epdc_group.epdc_topic
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+		select GRID_ID,
+						0 as userTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						count(id) as shiftProjectTotal,
+						count(ITEM_STATE = 10 OR NULL) as resolvedProjectTotal
+			from esua_epdc_events.epdc_item
+			where DEL_FLAG=0
+			group by GRID_ID)total
+		group by 	total.GRID_ID)t on gr.id=t.GRID_ID
+		where gr.del_flag=0
+					and gr.type_key='grid_party'
+					and gr.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+
+
+UNION ALL
+
+	SELECT co.id as orgId,
+				 co.name as orgName,
+				 co.pid as parentId,
+				'department' as orgType,
+				 SUM(IFNULL(t.userTotal,0)) AS userTotal,
+				 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
+				 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
+				 SUM(IFNULL(t.shiftProjectTotal,0)) AS shiftProjectTotal,
+				 SUM(IFNULL(t.resolvedProjectTotal,0)) AS resolvedProjectTotal
+	FROM esua_epdc_admin.sys_dept co
+	LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
+	left join
+		(select  total.GRID_ID,
+						sum(total.userTotal) as userTotal,
+						sum(total.issueTotal) as issueTotal,
+						sum(total.topicTotal) as topicTotal,
+						sum(total.shiftProjectTotal) as shiftProjectTotal,
+						sum(total.resolvedProjectTotal) as resolvedProjectTotal
+			from
+			(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+								 SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+								 WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+								 ORDER BY
+									 CREATED_TIME,id
+								 LIMIT 1 )
+						) AS GRID_ID,
+						count(eu.id) as userTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						0 as shiftProjectTotal,
+						0 as resolvedProjectTotal
+				from esua_epdc_user.epdc_user eu
+				where eu.DEL_FLAG=0
+				group by eu.DEPT_ID
+
+		UNION ALL
+
+			select  GRID_ID,
+							0 as userTotal,
+							count(id) as issueTotal,
+							0 as topicTotal,
+							0 as shiftProjectTotal,
+							0 as resolvedProjectTotal
+				from esua_epdc_events.epdc_issue
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+			select GRID_ID,
+							0 as userTotal,
+							0 as issueTotal,
+							count(id) as topicTotal,
+							0 as shiftProjectTotal,
+							0 as resolvedProjectTotal
+				from esua_epdc_group.epdc_topic
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+		select GRID_ID,
+						0 as userTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						count(id) as shiftProjectTotal,
+						count(ITEM_STATE = 10 OR NULL) as resolvedProjectTotal
+			from esua_epdc_events.epdc_item
+			where DEL_FLAG=0
+			group by GRID_ID)total
+		group by 	total.GRID_ID)t on gr.id=t.GRID_ID
+		where gr.del_flag=0
+					and co.del_flag=0
+					and co.type_key='community_party'
+					and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+		GROUP BY co.id
+
+union all
+
+	SELECT st.id as orgId,
+				 st.name as orgName,
+				 st.pid as parentId,
+				'department' as orgType,
+				 SUM(IFNULL(t.userTotal,0)) AS userTotal,
+				 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
+				 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
+				 SUM(IFNULL(t.shiftProjectTotal,0)) AS shiftProjectTotal,
+				 SUM(IFNULL(t.resolvedProjectTotal,0)) AS resolvedProjectTotal
+	FROM esua_epdc_admin.sys_dept st
+	left join esua_epdc_admin.sys_dept co on co.pid=st.id
+	LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
+	left join
+		(select  total.GRID_ID,
+						sum(total.userTotal) as userTotal,
+						sum(total.issueTotal) as issueTotal,
+						sum(total.topicTotal) as topicTotal,
+						sum(total.shiftProjectTotal) as shiftProjectTotal,
+						sum(total.resolvedProjectTotal) as resolvedProjectTotal
+			from
+			(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+								 SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+								 WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+								 ORDER BY
+									 CREATED_TIME,id
+								 LIMIT 1 )
+						) AS GRID_ID,
+						count(eu.id) as userTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						0 as shiftProjectTotal,
+						0 as resolvedProjectTotal
+				from esua_epdc_user.epdc_user eu
+				where eu.DEL_FLAG=0
+				group by eu.DEPT_ID
+
+		UNION ALL
+
+			select  GRID_ID,
+							0 as userTotal,
+							count(id) as issueTotal,
+							0 as topicTotal,
+							0 as shiftProjectTotal,
+							0 as resolvedProjectTotal
+				from esua_epdc_events.epdc_issue
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+			select GRID_ID,
+							0 as userTotal,
+							0 as issueTotal,
+							count(id) as topicTotal,
+							0 as shiftProjectTotal,
+							0 as resolvedProjectTotal
+				from esua_epdc_group.epdc_topic
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+		select GRID_ID,
+						0 as userTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						count(id) as shiftProjectTotal,
+						count(ITEM_STATE = 10 OR NULL) as resolvedProjectTotal
+			from esua_epdc_events.epdc_item
+			where DEL_FLAG=0
+			group by GRID_ID)total
+		group by 	total.GRID_ID)t on gr.id=t.GRID_ID
+		where gr.del_flag=0
+					and co.del_flag=0
+					and st.del_flag=0
+					and st.type_key='street_party'
+					and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+		GROUP BY st.id
+
+union all
+
+	SELECT city.id as orgId,
+				 city.name as orgName,
+				 city.pid as parentId,
+				'department' as orgType,
+				 SUM(IFNULL(t.userTotal,0)) AS userTotal,
+				 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
+				 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
+				 SUM(IFNULL(t.shiftProjectTotal,0)) AS shiftProjectTotal,
+				 SUM(IFNULL(t.resolvedProjectTotal,0)) AS resolvedProjectTotal
+	FROM esua_epdc_admin.sys_dept city
+	left join esua_epdc_admin.sys_dept st on st.pid=city.id
+	left join esua_epdc_admin.sys_dept co on co.pid=st.id
+	LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
+	left join
+		(select  total.GRID_ID,
+						sum(total.userTotal) as userTotal,
+						sum(total.issueTotal) as issueTotal,
+						sum(total.topicTotal) as topicTotal,
+						sum(total.shiftProjectTotal) as shiftProjectTotal,
+						sum(total.resolvedProjectTotal) as resolvedProjectTotal
+			from
+			(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+								 SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+								 WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+								 ORDER BY
+									 CREATED_TIME,id
+								 LIMIT 1 )
+						) AS GRID_ID,
+						count(eu.id) as userTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						0 as shiftProjectTotal,
+						0 as resolvedProjectTotal
+				from esua_epdc_user.epdc_user eu
+				where eu.DEL_FLAG=0
+				group by eu.DEPT_ID
+
+		UNION ALL
+
+			select  GRID_ID,
+							0 as userTotal,
+							count(id) as issueTotal,
+							0 as topicTotal,
+							0 as shiftProjectTotal,
+							0 as resolvedProjectTotal
+				from esua_epdc_events.epdc_issue
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+			select GRID_ID,
+							0 as userTotal,
+							0 as issueTotal,
+							count(id) as topicTotal,
+							0 as shiftProjectTotal,
+							0 as resolvedProjectTotal
+				from esua_epdc_group.epdc_topic
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+		select GRID_ID,
+						0 as userTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						count(id) as shiftProjectTotal,
+						count(ITEM_STATE = 10 OR NULL) as resolvedProjectTotal
+			from esua_epdc_events.epdc_item
+			where DEL_FLAG=0
+			group by GRID_ID)total
+		group by 	total.GRID_ID)t on gr.id=t.GRID_ID
+		where gr.del_flag=0
+					and co.del_flag=0
+					and st.del_flag=0
+					and city.DEL_FLAG=0
+					and city.type_key='district_party' and city.party_code='shibei'
+		GROUP BY city.id
+    </select>
+    <select id="usertotaldata" resultType="com.elink.esua.epdc.dto.screen.result.UsertotaldataResultDTO">
+        	SELECT gr.id as orgId,
+				 gr.name as orgName,
+				 gr.pid as parentId,
+				'grid' as orgType,
+				 IFNULL(t.userTotal,0) AS userTotal,
+				 IFNULL(t.partyTotal,0) AS partyTotal,
+				 IFNULL(t.groupTotal,0) AS groupTotal,
+				 IFNULL(t.issueTotal,0) AS issueTotal,
+				 IFNULL(t.topicTotal,0) AS topicTotal,
+				 IFNULL(t.projectTotal,0) AS projectTotal
+	FROM esua_epdc_admin.sys_dept gr
+	left join
+		(select  total.GRID_ID,
+						sum(total.userTotal) as userTotal,
+						sum(total.partyTotal) as partyTotal,
+						sum(total.groupTotal) as groupTotal,
+						sum(total.issueTotal) as issueTotal,
+						sum(total.topicTotal) as topicTotal,
+						sum(total.projectTotal) as projectTotal
+			from
+			(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+								 SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+								 WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+								 ORDER BY
+									 CREATED_TIME,id
+								 LIMIT 1 )
+						) AS GRID_ID,
+						count(eu.id) as userTotal,
+						count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
+						0 as groupTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						0 as projectTotal
+				from esua_epdc_user.epdc_user eu
+				where eu.DEL_FLAG=0
+				group by eu.DEPT_ID
+
+		UNION ALL
+
+			select  GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+							count(id) as groupTotal,
+							0 as issueTotal,
+							0 as topicTotal,
+							0 as projectTotal
+				from esua_epdc_group.epdc_group
+				where DEL_FLAG=0 and STATE=10
+				group by GRID_ID
+
+		union all
+
+			select  GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+							0 as groupTotal,
+							count(id) as issueTotal,
+							0 as topicTotal,
+							0 as projectTotal
+				from esua_epdc_events.epdc_issue
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+			select GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+							0 as groupTotal,
+							0 as issueTotal,
+							count(id) as topicTotal,
+							0 as projectTotal
+				from esua_epdc_group.epdc_topic
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+		select GRID_ID,
+						0 as userTotal,
+						0 AS partyTotal,
+						0 as groupTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						count(id) as projectTotal
+			from esua_epdc_events.epdc_item
+			where DEL_FLAG=0
+			group by GRID_ID)total
+		group by 	total.GRID_ID)t on gr.id=t.GRID_ID
+		where gr.del_flag=0
+					and gr.type_key='grid_party'
+					and gr.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+
+UNION ALL
+
+	SELECT co.id as orgId,
+				 co.name as orgName,
+				 co.pid as parentId,
+				'department' as orgType,
+				 SUM(IFNULL(t.userTotal,0)) AS userTotal,
+				 SUM(IFNULL(t.partyTotal,0)) AS partyTotal,
+				 SUM(IFNULL(t.groupTotal,0)) AS groupTotal,
+				 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
+				 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
+				 SUM(IFNULL(t.projectTotal,0)) AS projectTotal
+	FROM esua_epdc_admin.sys_dept co
+	LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
+	left join
+		(select  total.GRID_ID,
+						 sum(total.userTotal) as userTotal,
+						 sum(total.partyTotal) as partyTotal,
+						 sum(total.groupTotal) as groupTotal,
+						 sum(total.issueTotal) as issueTotal,
+						 sum(total.topicTotal) as topicTotal,
+						 sum(total.projectTotal) as projectTotal
+			from
+			(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+								 SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+								 WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+								 ORDER BY
+									 CREATED_TIME,id
+								 LIMIT 1 )
+						) AS GRID_ID,
+						count(eu.id) as userTotal,
+						count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
+						0 as groupTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						0 as projectTotal
+				from esua_epdc_user.epdc_user eu
+				where eu.DEL_FLAG=0
+				group by eu.DEPT_ID
+
+		UNION ALL
+
+		select  GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+							count(id) as groupTotal,
+							0 as issueTotal,
+							0 as topicTotal,
+							0 as projectTotal
+				from esua_epdc_group.epdc_group
+				where DEL_FLAG=0 and STATE=10
+				group by GRID_ID
+
+		union all
+
+			select  GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+						  0 as groupTotal,
+							count(id) as issueTotal,
+							0 as topicTotal,
+							0 as projectTotal
+				from esua_epdc_events.epdc_issue
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+			select GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+						  0 as groupTotal,
+							0 as issueTotal,
+							count(id) as topicTotal,
+							0 as projectTotal
+				from esua_epdc_group.epdc_topic
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+		select GRID_ID,
+						0 as userTotal,
+						0 AS partyTotal,
+						0 as groupTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						count(id) as projectTotal
+			from esua_epdc_events.epdc_item
+			where DEL_FLAG=0
+			group by GRID_ID)total
+		group by 	total.GRID_ID)t on gr.id=t.GRID_ID
+		where gr.del_flag=0
+					and co.del_flag=0
+					and co.type_key='community_party'
+					and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+		GROUP BY co.id
+
+union all
+
+		SELECT st.id as orgId,
+				 st.name as orgName,
+				 st.pid as parentId,
+				'department' as orgType,
+				 SUM(IFNULL(t.userTotal,0)) AS userTotal,
+				 SUM(IFNULL(t.partyTotal,0)) AS partyTotal,
+				 SUM(IFNULL(t.groupTotal,0)) AS groupTotal,
+				 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
+				 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
+				 SUM(IFNULL(t.projectTotal,0)) AS projectTotal
+	FROM esua_epdc_admin.sys_dept st
+	left join esua_epdc_admin.sys_dept co on co.pid=st.id
+	LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
+	left join
+		(select  total.GRID_ID,
+						 sum(total.userTotal) as userTotal,
+						 sum(total.partyTotal) as partyTotal,
+						 sum(total.groupTotal) as groupTotal,
+						 sum(total.issueTotal) as issueTotal,
+						 sum(total.topicTotal) as topicTotal,
+						 sum(total.projectTotal) as projectTotal
+			from
+			(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+								 SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+								 WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+								 ORDER BY
+									 CREATED_TIME,id
+								 LIMIT 1 )
+						) AS GRID_ID,
+						count(eu.id) as userTotal,
+						count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
+						0 as groupTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						0 as projectTotal
+				from esua_epdc_user.epdc_user eu
+				where eu.DEL_FLAG=0
+				group by eu.DEPT_ID
+
+		UNION ALL
+
+		select  GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+							count(id) as groupTotal,
+							0 as issueTotal,
+							0 as topicTotal,
+							0 as projectTotal
+				from esua_epdc_group.epdc_group
+				where DEL_FLAG=0 and STATE=10
+				group by GRID_ID
+
+		union all
+
+			select  GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+						  0 as groupTotal,
+							count(id) as issueTotal,
+							0 as topicTotal,
+							0 as projectTotal
+				from esua_epdc_events.epdc_issue
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+			select GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+						  0 as groupTotal,
+							0 as issueTotal,
+							count(id) as topicTotal,
+							0 as projectTotal
+				from esua_epdc_group.epdc_topic
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+		select GRID_ID,
+						0 as userTotal,
+						0 AS partyTotal,
+						0 as groupTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						count(id) as projectTotal
+			from esua_epdc_events.epdc_item
+			where DEL_FLAG=0
+			group by GRID_ID)total
+		group by 	total.GRID_ID)t on gr.id=t.GRID_ID
+		where gr.del_flag=0
+					and co.del_flag=0
+					and st.del_flag=0
+					and st.type_key='street_party'
+					and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+		GROUP BY st.id
+
+union all
+
+		SELECT city.id as orgId,
+				 city.name as orgName,
+				 city.pid as parentId,
+				'department' as orgType,
+				 SUM(IFNULL(t.userTotal,0)) AS userTotal,
+				 SUM(IFNULL(t.partyTotal,0)) AS partyTotal,
+				 SUM(IFNULL(t.groupTotal,0)) AS groupTotal,
+				 SUM(IFNULL(t.issueTotal,0)) AS issueTotal,
+				 SUM(IFNULL(t.topicTotal,0)) AS topicTotal,
+				 SUM(IFNULL(t.projectTotal,0)) AS projectTotal
+	FROM esua_epdc_admin.sys_dept city
+	left join esua_epdc_admin.sys_dept st on st.pid=city.id
+	left join esua_epdc_admin.sys_dept co on co.pid=st.id
+	LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
+	left join
+		(select  total.GRID_ID,
+						 sum(total.userTotal) as userTotal,
+						 sum(total.partyTotal) as partyTotal,
+						 sum(total.groupTotal) as groupTotal,
+						 sum(total.issueTotal) as issueTotal,
+						 sum(total.topicTotal) as topicTotal,
+						 sum(total.projectTotal) as projectTotal
+			from
+			(select ifnull(if(eu.DEPT_ID = 0, NULL, eu.DEPT_ID), (
+								 SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+								 WHERE DEL_FLAG = '0' AND USER_ID = eu.ID
+								 ORDER BY
+									 CREATED_TIME,id
+								 LIMIT 1 )
+						) AS GRID_ID,
+						count(eu.id) as userTotal,
+						count(eu.PARTY_FLAG = '1' OR NULL ) AS partyTotal,
+						0 as groupTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						0 as projectTotal
+				from esua_epdc_user.epdc_user eu
+				where eu.DEL_FLAG=0
+				group by eu.DEPT_ID
+
+		UNION ALL
+
+		select  GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+							count(id) as groupTotal,
+							0 as issueTotal,
+							0 as topicTotal,
+							0 as projectTotal
+				from esua_epdc_group.epdc_group
+				where DEL_FLAG=0 and STATE=10
+				group by GRID_ID
+
+		union all
+
+			select  GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+						  0 as groupTotal,
+							count(id) as issueTotal,
+							0 as topicTotal,
+							0 as projectTotal
+				from esua_epdc_events.epdc_issue
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+			select GRID_ID,
+							0 as userTotal,
+							0 AS partyTotal,
+						  0 as groupTotal,
+							0 as issueTotal,
+							count(id) as topicTotal,
+							0 as projectTotal
+				from esua_epdc_group.epdc_topic
+				where DEL_FLAG=0
+				group by GRID_ID
+
+		UNION ALL
+
+		select GRID_ID,
+						0 as userTotal,
+						0 AS partyTotal,
+						0 as groupTotal,
+						0 as issueTotal,
+						0 as topicTotal,
+						count(id) as projectTotal
+			from esua_epdc_events.epdc_item
+			where DEL_FLAG=0
+			group by GRID_ID)total
+		group by 	total.GRID_ID)t on gr.id=t.GRID_ID
+		where gr.del_flag=0
+					and co.del_flag=0
+					and st.del_flag=0
+					and city.DEL_FLAG=0
+					and city.type_key='district_party' and city.party_code='shibei'
+		GROUP BY city.id
+    </select>
+    <select id="meetdata" resultType="com.elink.esua.epdc.dto.screen.result.MeetdataResultDTO">
+        select  d.id as orgId,
+				d.name as orgName,
+				d.pid as parentId,
+				date_format( now( ), '%Y' ) as yearId,
+				date_format( now( ), '%Y-%m' ) as monthId,
+				(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+						  WHEN ed.DAILY_TYPE='20' THEN 'union'
+						  WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+				ed.MEET_TYPE as meetCategoryId,
+				me.RESOURCE_LABEL as meetCategoryName,
+				count(ed.id) as organizeCount,
+				IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount,
+				IFNULL(round(IFNULL(sum(ed.JOIN_NUM),0)/count(ed.id),0),0) as averageJoinUserCount
+	FROM esua_epdc_admin.sys_dept d
+		left join (select  id,
+											 DAILY_TYPE,
+											 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+											 DEPT_ID,
+											 JOIN_NUM,
+											 DEL_FLAG
+								from esua_epdc_workrecord.epdc_daily_record_info
+								where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
+		left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+	WHERE d.DEL_FLAG=0
+				and ed.DEL_FLAG=0
+				and d.type_key='grid_party'
+				and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+	group by ed.DEPT_ID,ed.DAILY_TYPE,ed.MEET_TYPE
+
+union all -- 社区
+
+		select  community.orgId,
+						community.orgName,
+						community.parentId,
+						community.yearId,
+						community.monthId,
+						community.type,
+						community.meetCategoryId,
+						community.meetCategoryName,
+						SUM(community.organizeCount) AS organizeCount,
+						SUM(community.joinUserCount) AS joinUserCount,
+						IFNULL(round(SUM(community.joinUserCount)/SUM(community.organizeCount),0),0) as averageJoinUserCount
+			from
+			(select  co.id as orgId,
+						co.name as orgName,
+						co.pid as parentId,
+						date_format( now( ), '%Y' ) as yearId,
+						date_format( now( ), '%Y-%m' ) as monthId,
+						ed.DAILY_TYPE,
+						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+									WHEN ed.DAILY_TYPE='20' THEN 'union'
+									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+						ed.MEET_TYPE as meetCategoryId,
+						me.RESOURCE_LABEL as meetCategoryName,
+						count(ed.id) as organizeCount,
+						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+			FROM esua_epdc_admin.sys_dept co
+				left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
+				left join (select  id,
+													 DAILY_TYPE,
+													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+													 DEPT_ID,
+													 JOIN_NUM,
+													 DEL_FLAG
+										from esua_epdc_workrecord.epdc_daily_record_info
+										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=gr.id
+				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+			WHERE gr.DEL_FLAG=0
+						and co.DEL_FLAG=0
+						and ed.DEL_FLAG=0
+						and co.type_key='community_party'
+						and co.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+			group by co.id,ed.DAILY_TYPE,ed.MEET_TYPE
+
+		union all
+			select  d.id as orgId,
+						d.name as orgName,
+						d.pid as parentId,
+						date_format( now( ), '%Y' ) as yearId,
+						date_format( now( ), '%Y-%m' ) as monthId,
+						ed.DAILY_TYPE,
+						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+									WHEN ed.DAILY_TYPE='20' THEN 'union'
+									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+						ed.MEET_TYPE as meetCategoryId,
+						me.RESOURCE_LABEL as meetCategoryName,
+						count(ed.id) as organizeCount,
+						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+			FROM esua_epdc_admin.sys_dept d
+				left join (select  id,
+													 DAILY_TYPE,
+													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+													 DEPT_ID,
+													 JOIN_NUM,
+													 DEL_FLAG
+										from esua_epdc_workrecord.epdc_daily_record_info
+										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
+				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+			WHERE d.DEL_FLAG=0
+						and ed.DEL_FLAG=0
+						and d.type_key='community_party'
+						and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+			group by ed.DEPT_ID,ed.DAILY_TYPE,ed.MEET_TYPE)community
+		group by community.orgId,community.DAILY_TYPE,community.meetCategoryId
+
+union all -- 街道
+
+	select  street.orgId,
+						street.orgName,
+						street.parentId,
+						street.yearId,
+						street.monthId,
+						street.type,
+						street.meetCategoryId,
+						street.meetCategoryName,
+						SUM(street.organizeCount) AS organizeCount,
+						SUM(street.joinUserCount) AS joinUserCount,
+						IFNULL(round(SUM(street.joinUserCount)/SUM(street.organizeCount),0),0) as averageJoinUserCount
+			from
+			(select  st.id as orgId,
+						st.name as orgName,
+						st.pid as parentId,
+						date_format( now( ), '%Y' ) as yearId,
+						date_format( now( ), '%Y-%m' ) as monthId,
+						ed.DAILY_TYPE,
+						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+									WHEN ed.DAILY_TYPE='20' THEN 'union'
+									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+						ed.MEET_TYPE as meetCategoryId,
+						me.RESOURCE_LABEL as meetCategoryName,
+						count(ed.id) as organizeCount,
+						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+			FROM esua_epdc_admin.sys_dept st
+				left join esua_epdc_admin.sys_dept co on co.pid=st.id
+				left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
+				left join (select  id,
+													 DAILY_TYPE,
+													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+													 DEPT_ID,
+													 JOIN_NUM,
+													 DEL_FLAG
+										from esua_epdc_workrecord.epdc_daily_record_info
+										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=gr.id
+				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+			WHERE gr.DEL_FLAG=0
+						and co.DEL_FLAG=0
+						and ed.DEL_FLAG=0
+						and st.DEL_FLAG=0
+						and st.type_key='street_party'
+						and st.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+			group by st.id,ed.DAILY_TYPE,ed.MEET_TYPE
+
+		union all
+
+			select  d.id as orgId,
+						d.name as orgName,
+						d.pid as parentId,
+						date_format( now( ), '%Y' ) as yearId,
+						date_format( now( ), '%Y-%m' ) as monthId,
+						ed.DAILY_TYPE,
+						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+									WHEN ed.DAILY_TYPE='20' THEN 'union'
+									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+						ed.MEET_TYPE as meetCategoryId,
+						me.RESOURCE_LABEL as meetCategoryName,
+						count(ed.id) as organizeCount,
+						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+			FROM esua_epdc_admin.sys_dept d
+				left join (select  id,
+													 DAILY_TYPE,
+													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+													 DEPT_ID,
+													 JOIN_NUM,
+													 DEL_FLAG
+										from esua_epdc_workrecord.epdc_daily_record_info
+										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
+				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+			WHERE d.DEL_FLAG=0
+						and ed.DEL_FLAG=0
+						and d.type_key='street_party'
+						and d.id not in ('1191534129122230274','1191534416067149825','1191535301279203329','1191535501527859202',
+'1191535697380884481','1192004624745586689','1230704850994528257',
+'1201319745506598913','1201687651826360321','1201689212329746433')
+			group by ed.DEPT_ID,ed.DAILY_TYPE,ed.MEET_TYPE)street
+		group by street.orgId,street.DAILY_TYPE,street.meetCategoryId
+
+union all -- 市北区
+
+		select  city.orgId,
+						city.orgName,
+						city.parentId,
+						city.yearId,
+						city.monthId,
+						city.type,
+						city.meetCategoryId,
+						city.meetCategoryName,
+						SUM(city.organizeCount) AS organizeCount,
+						SUM(city.joinUserCount) AS joinUserCount,
+						IFNULL(round(SUM(city.joinUserCount)/SUM(city.organizeCount),0),0) as averageJoinUserCount
+			from
+			(select  city.id as orgId,
+						city.name as orgName,
+						city.pid as parentId,
+						date_format( now( ), '%Y' ) as yearId,
+						date_format( now( ), '%Y-%m' ) as monthId,
+						ed.DAILY_TYPE,
+						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+									WHEN ed.DAILY_TYPE='20' THEN 'union'
+									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+						ed.MEET_TYPE as meetCategoryId,
+						me.RESOURCE_LABEL as meetCategoryName,
+						count(ed.id) as organizeCount,
+						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+			FROM esua_epdc_admin.sys_dept city
+				left join esua_epdc_admin.sys_dept st on st.pid=city.id
+				left join esua_epdc_admin.sys_dept co on co.pid=st.id
+				left join esua_epdc_admin.sys_dept gr on co.id=gr.pid
+				left join (select  id,
+													 DAILY_TYPE,
+													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+													 DEPT_ID,
+													 JOIN_NUM,
+													 DEL_FLAG
+										from esua_epdc_workrecord.epdc_daily_record_info
+										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=gr.id
+				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+			WHERE gr.DEL_FLAG=0
+						and co.DEL_FLAG=0
+						and ed.DEL_FLAG=0
+						and st.DEL_FLAG=0
+						and city.type_key='district_party' and city.party_code='shibei'
+			group by city.id,ed.DAILY_TYPE,ed.MEET_TYPE
+
+		union all
+
+			select  d.id as orgId,
+						d.name as orgName,
+						d.pid as parentId,
+						date_format( now( ), '%Y' ) as yearId,
+						date_format( now( ), '%Y-%m' ) as monthId,
+						ed.DAILY_TYPE,
+						(CASE WHEN ed.DAILY_TYPE='10' THEN 'party'
+									WHEN ed.DAILY_TYPE='20' THEN 'union'
+									WHEN ed.DAILY_TYPE='30' THEN 'voluntaryservice' end) as type,
+						ed.MEET_TYPE as meetCategoryId,
+						me.RESOURCE_LABEL as meetCategoryName,
+						count(ed.id) as organizeCount,
+						IFNULL(sum(ed.JOIN_NUM),0) as joinUserCount
+			FROM esua_epdc_admin.sys_dept d
+				left join (select  id,
+													 DAILY_TYPE,
+													 if(DAILY_TYPE='30','30',MEET_TYPE) as MEET_TYPE,
+													 DEPT_ID,
+													 JOIN_NUM,
+													 DEL_FLAG
+										from esua_epdc_workrecord.epdc_daily_record_info
+										where date_format( CREATED_TIME, '%Y-%m' ) = date_format( now( ), '%Y-%m' ) )ed on ed.DEPT_ID=d.id
+				left join esua_epdc_workrecord.epdc_resources_dictionary me on me.RESOURCE_CODE=ed.MEET_TYPE
+			WHERE d.DEL_FLAG=0
+						and ed.DEL_FLAG=0
+						and d.type_key='district_party' and d.party_code='shibei'
+			group by ed.DEPT_ID,ed.DAILY_TYPE,ed.MEET_TYPE)city
+		group by city.orgId,city.DAILY_TYPE,city.meetCategoryId
+    </select>
+    <select id="customergrid" resultType="com.elink.esua.epdc.dto.screen.result.CustomergridResultDTO">
+         select
+            sd.ID gridId,
+              sd.NAME gridName,
+                    sd.PID parentAgencyId,
+              sd.area_marks areaMarks,
+              sd.center_mark centerMark,
+              '' partyMark
+                from esua_epdc_admin.sys_dept_temp sd
+            left join esua_epdc_admin.sys_dept d1 on d1.ID = sd.ID
+            left join esua_epdc_admin.sys_dept d2 on d2.ID = d1.PID
+            left join esua_epdc_admin.sys_dept d3 on d3.ID = d2.PID
+            left join esua_epdc_admin.sys_dept d4 on d4.ID = d3.PID
+                where
+                sd.DEL_FLAG = '0'
+            and sd.type_key in ('grid_party')
+            and sd.ID not in ('1191534129122230274',
+                     '1191534416067149825',
+                     '1191535301279203329',
+                     '1191535501527859202',
+                     '1191535697380884481',
+                     '1192004624745586689',
+                     '1230704850994528257',
+                     '1201319745506598913',
+                     '1201687651826360321',
+                     '1201689212329746433')
+    </select>
+    <select id="customeragency" resultType="com.elink.esua.epdc.dto.screen.result.CustomeragencyResultDTO">
+         select
+              sd.ID agencyId,
+              sd.NAME agencyName,
+              sd.PID pid,
+              sd.pids pids,
+              concat(if(d4.name is null,'',concat(IFNULL(d4.name,''),'-')),if(d3.name is null,'',concat(IFNULL(d3.name,''),'-')),IFNULL(d2.name,'')) allParentNames ,
+              sd.area_marks areaMarks,
+              sd.center_mark centerMark,
+              '' partyMark,
+              sd.type_key level,
+              '' areaCode
+                from esua_epdc_admin.sys_dept_temp sd
+            left join esua_epdc_admin.sys_dept d1 on d1.ID = sd.ID
+            left join esua_epdc_admin.sys_dept d2 on d2.ID = d1.PID
+            left join esua_epdc_admin.sys_dept d3 on d3.ID = d2.PID
+            left join esua_epdc_admin.sys_dept d4 on d4.ID = d3.PID
+                where
+                sd.DEL_FLAG = '0'
+            and sd.type_key in ('district_party','street_party','community_party')
+            and sd.party_code != '001'
+            and sd.ID not in ('1191534129122230274',
+                     '1191534416067149825',
+                     '1191535301279203329',
+                     '1191535501527859202',
+                     '1191535697380884481',
+                     '1192004624745586689',
+                     '1230704850994528257',
+                     '1201319745506598913',
+                     '1201687651826360321',
+                     '1201689212329746433')
+    </select>
+</mapper>