追加了上报11个接口相关dto

5 years ago · 69b3785627
38 changed files with 2162 additions and 5 deletions
--- a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
+++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
@ -46,9 +46,6 @@ public class SysDeptDTO extends TreeNode implements Serializable {
    @NotBlank(message = "{sysdept.name.require}", groups = DefaultGroup.class)
    private String name;

-    @ApiModelProperty(value = "区域编码")
-    private String areaCode;
-
    @ApiModelProperty(value = "排序")
    @Min(value = 0, message = "{sort.number}", groups = DefaultGroup.class)
    private Integer sort;
@ -65,10 +62,13 @@ public class SysDeptDTO extends TreeNode implements Serializable {
     */
    private String typeKey;

+
+    private String partyCode;
+
    /**
-     * 部门编码
+     * 区域编码
     */
-    private String partyCode;
+    private String areaCode;

    public String getPartyCode() {
        return partyCode;
@ -118,6 +118,14 @@ public class SysDeptDTO extends TreeNode implements Serializable {
        this.typeKey = typeKey;
    }

+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
    @Override
    public Long getId() {
        return id;
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenJobFormDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ScreenJobFormDTO.java
@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto.screen.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 大屏数据统计 定时任务入参
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/15 9:18
+ */
+@Data
+public class ScreenJobFormDTO implements Serializable {
+    private static final long serialVersionUID = 4393418231149397108L;
+
+    /**
+     * 统计月份
+     */
+    private String yearMonth;
+
+    /**
+     * 统计数量
+     */
+    private Integer pageSize;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DeptGovrnAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DeptGovrnAbilityDTO.java
@ -0,0 +1,72 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 08、治理能力-部门相关指标
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class DeptGovrnAbilityDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关id:网格所属的组织id
+     */
+    private String agencyId;
+
+    /**
+     * 上级组织id
+     */
+    private String deptId;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * yyyyQ1, yyyyQ2, yyyyQ3, yyyyQ4
+     */
+    private String quarterId;
+
+    /**
+     * yyyy
+     */
+    private String yearId;
+
+    /**
+     * 区直部门被吹哨次数
+     */
+    private Integer transferedCount;
+
+    /**
+     * 区直部门办结项目数
+     */
+    private Integer closedProjectCount;
+
+    /**
+     * 区直部门项目响应度 所有被吹哨后的滞留时间除以项目数
+     */
+    private BigDecimal respProjectRatio;
+
+    /**
+     * 区直部门办结项目的处理效率
+     */
+    private BigDecimal handleProjectRatio;
+
+    /**
+     * 区直部门项目办结率
+     */
+    private BigDecimal closedProjectRatio;
+
+    /**
+     * 办结项目满意度
+     */
+    private BigDecimal satisfactionRatio;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGovrnAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGovrnAbilityDTO.java
@ -0,0 +1,82 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 06、治理能力-网格相关指标
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class GridGovrnAbilityDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关id:网格所属的组织id
+     */
+    private String agencyId;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * yyyyQ1, yyyyQ2, yyyyQ3, yyyyQ4
+     */
+    private String quarterId;
+
+    /**
+     * yyyy
+     */
+    private String yearId;
+
+    /**
+     * 网格总议题数
+     */
+    private Integer issueTotal;
+
+    /**
+     * 网格人均议题数目
+     */
+    private Integer avgIssueCount;
+
+    /**
+     * 网格总项目数
+     */
+    private Integer projectTotal;
+
+    /**
+     * 网格办结项目数
+     */
+    private Integer resolveProjectCount;
+
+    /**
+     * 网格吹哨部门准确率
+     */
+    private BigDecimal transferRightRatio;
+
+    /**
+     * 网格内解决的项目的满意度
+     */
+    private BigDecimal satisfactionRatio;
+
+    /**
+     * 网格议题转项目率
+     */
+    private BigDecimal issueToProjectRatio;
+
+    /**
+     * 网格自治项目数 统计期网格自身内办结的项目数目
+     */
+    private Integer selfSolveProjectCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyAbilityDTO.java
@ -0,0 +1,107 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 02、党建能力-网格相关指标上报
+ * @Auther: zhangyong
+ * @Date: 2020/9/14 10:04
+ */
+@Data
+public class GridPartyAbilityDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关id:网格所属的组织id
+     */
+    private String agencyId;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * yyyyQ1, yyyyQ2, yyyyQ3, yyyyQ4
+     */
+    private String quarterId;
+
+    /**
+     * yyyy
+     */
+    private String yearId;
+
+    /**
+     * 网格党员用户数
+     */
+    private Integer partyCount;
+
+    /**
+     * 网格党员人均提出的议题转项目数
+     */
+    private BigDecimal partyAvgShiftProjectCount;
+
+    /**
+     * 网格活跃群众用户数
+     */
+    private Integer activeUserCount;
+
+    /**
+     * 网格活跃党员用户数
+     */
+    private Integer activePartyCount;
+
+    /**
+     * 网格党员人均提出话题数
+     */
+    private Integer partyAvgTopicCount;
+
+    /**
+     * 网格群众人均提出话题数
+     */
+    private Integer userAvgTopicCount;
+
+    /**
+     * 网格群众用户数
+     */
+    private Integer userCount;
+
+    /**
+     * 网格群众人均提出的议题转项目数
+     */
+    private BigDecimal userAvgShiftProjectCount;
+
+    /**
+     * 建群党员数（累计值）
+     */
+    private Integer createGroupPartyCount;
+
+    /**
+     * 网格发文数
+     */
+    private Integer publishArticleCount;
+
+    /**
+     * 网格议题转项目率
+     */
+    private BigDecimal issueToProjectRatio;
+
+    /**
+     * 组织三会一课次数
+     */
+    private Integer createThreeMeetsCount;
+
+    /**
+     * 党员参加三会一课人次
+     */
+    private Integer joinThreeMeetsCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyMemberDataDetailDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyMemberDataDetailDTO.java
@ -0,0 +1,97 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 01、党建能力-党员相关指标上报
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/9/14 10:04
+ */
+@Data
+public class GridPartyMemberDataDetailDTO implements Serializable {
+    private static final long serialVersionUID = 2923515319015973995L;
+
+    /**
+     * 机关id:网格所属的组织id
+     */
+    private String agencyId;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * yyyyQ1, yyyyQ2, yyyyQ3, yyyyQ4
+     */
+    private String quarterId;
+
+    /**
+     * yyyy
+     */
+    private String yearId;
+
+    /**
+     * 党员提出的话题数
+     */
+    private Integer createTopicCount;
+
+    /**
+     * 党员参与话题数（支持，反对，评论，浏览）
+     */
+    private Integer joinTopicCount;
+
+    /**
+     * 话题转议题数
+     */
+    private Integer shiftIssueCount;
+
+    /**
+     * 议题转项目数
+     */
+    private Integer shiftProjectCount;
+
+    /**
+     * 参加三会一课次数
+     */
+    private Integer joinThreeMeetsCount;
+
+    /**
+     * 自建群群众人数
+     */
+    private Integer groupUserCount;
+
+    /**
+     * 自建群活跃度-话题数
+     */
+    private Integer groupTopicCount;
+
+    /**
+     * 议题转项目率
+     */
+    private BigDecimal topicToIssueRatio;
+
+    /**
+     * 党员自建群活跃群众人数(08-24)
+     */
+    private Integer groupActiveUserCount;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 上级组织id
+     */
+    private String parentId;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridServiceAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridServiceAbilityDTO.java
@ -0,0 +1,58 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 04、服务能力-网格相关指标
+ * @Auther: zhangyong
+ * @Date: 2020/9/14 10:04
+ */
+@Data
+public class GridServiceAbilityDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关id:网格所属的组织id
+     */
+    private String agencyId;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * yyyyQ1, yyyyQ2, yyyyQ3, yyyyQ4
+     */
+    private String quarterId;
+
+    /**
+     * yyyy
+     */
+    private String yearId;
+
+    /**
+     * 网格活动组织次数 爱心活动
+     */
+    private Integer activityCount;
+
+    /**
+     * 网格志愿者占比
+     */
+    private Integer volunteerRatio;
+
+    /**
+     * 网格党员志愿者率
+     */
+    private BigDecimal partyVolunteerRatio;
+
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/HomePagePlatformSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/HomePagePlatformSummaryDTO.java
@ -0,0 +1,76 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 1、首页-平台各类总数上报
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/10 14:37
+ */
+@Data
+public class HomePagePlatformSummaryDTO implements Serializable {
+    private static final long serialVersionUID = 1847661183221467699L;
+
+    /**
+     * 网格总数
+     */
+    private Integer gridCount;
+
+    /**
+     * 已开通网格总数
+     */
+    private Integer openedGridCount;
+
+    /**
+     * 议题总数
+     */
+    private Integer issueCount;
+
+    /**
+     * 项目总数
+     */
+    private Integer projectCount;
+
+    /**
+     * 用户总数
+     */
+    private Integer userCount;
+
+    /**
+     * 党员用户
+     */
+    private Integer partyUserCount;
+
+    /**
+     * 社群总数
+     */
+    private Integer groupCount;
+
+    /**
+     * 话题总数
+     */
+    private Integer topicCount;
+
+    /**
+     * 新闻数量
+     */
+    private Integer newsCount;
+
+    /**
+     * 阅读数量
+     */
+    private Integer readCount;
+
+    /**
+     * 公益活动数量
+     */
+    private Integer actCount;
+
+    /**
+     * 志愿者总数
+     */
+    private Integer vounteerCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgGovrnAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgGovrnAbilityDTO.java
@ -0,0 +1,83 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 07、治理能力-街道及社区相关指标
+ * @Auther: zhangyong
+ * @Date: 2020-08-18 09:59
+ */
+@Data
+public class OrgGovrnAbilityDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关id:网格所属的组织id
+     */
+    private String agencyId;
+
+    /**
+     * 上级组织id
+     */
+    private String parentId;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * yyyyQ1, yyyyQ2, yyyyQ3, yyyyQ4
+     */
+    private String quarterId;
+
+    /**
+     * yyyy
+     */
+    private String yearId;
+
+    /**
+     * district：全区；community：社区；street：街道
+     */
+    private String dataType;
+
+    /**
+     * 被吹哨次数
+     */
+    private Integer transferedCount;
+
+    /**
+     * 办结项目数
+     */
+    private Integer closedProjectCount;
+
+    /**
+     * 项目响应度 所有被吹哨后的滞留时间除以项目数
+     */
+    private BigDecimal respProjectRatio;
+
+    /**
+     * 办结项目率
+     */
+    private BigDecimal closedProjectRatio;
+
+    /**
+     * 办结项目满意度
+     */
+    private BigDecimal satisfactionRatio;
+
+    /**
+     * 社区超期项目率，dataTyp=community有值
+     */
+    private BigDecimal overdueProjectRatio;
+
+
+    /**
+     * 街道办结项目的处理效率, data_type=street时有值
+     */
+    private BigDecimal handleProjectRatio;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgPartyAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgPartyAbilityDTO.java
@ -0,0 +1,52 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 03、党建能力-区街道及社区相关指标
+ * @Auther: zhangyong
+ * @Date: 2020/9/14 10:04
+ */
+@Data
+public class OrgPartyAbilityDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关id:网格所属的组织id
+     */
+    private String agencyId;
+
+    /**
+     * 上级组织id
+     */
+    private String parentId;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * yyyyQ1, yyyyQ2, yyyyQ3, yyyyQ4
+     */
+    private String quarterId;
+
+    /**
+     * yyyy
+     */
+    private String yearId;
+
+    /**
+     * district：全区；community：社区；street：街道
+     */
+    private String dataType;
+
+    /**
+     * 发文数
+     */
+    private Integer publishArticleCount;
+
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgServiceAbilityDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgServiceAbilityDTO.java
@ -0,0 +1,51 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 05、服务能力-组织（街道|社区|全区）相关指标
+ * @Auther: zhangyong
+ * @Date: 2020/9/14 10:04
+ */
+@Data
+public class OrgServiceAbilityDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机关id:网格所属的组织id
+     */
+    private String agencyId;
+
+    /**
+     * 上级组织id
+     */
+    private String parentId;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * yyyyQ1, yyyyQ2, yyyyQ3, yyyyQ4
+     */
+    private String quarterId;
+
+    /**
+     * yyyy
+     */
+    private String yearId;
+
+    /**
+     * district：全区；community：社区；street：街道
+     */
+    private String dataType;
+
+    /**
+     * 社区/街道活动组织次数 爱心活动
+     */
+    private Integer activityCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenActSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenActSummaryDTO.java
@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 7、公益互助-活动各类总数
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/12 9:59
+ */
+@Data
+public class ScreenActSummaryDTO implements Serializable {
+    private static final long serialVersionUID = 7488642199632781510L;
+
+    /**
+     * 活动总数
+     */
+    private Integer actCount;
+
+    /**
+     * 志愿者总数
+     */
+    private Integer volunteerCount;
+
+    /**
+     * 参与人次
+     */
+    private Integer partiUserCount;
+
+    /**
+     * 发放积分
+     */
+    private Integer rewardPointCount;
+
+    /**
+     * 公益时长 单位分钟
+     */
+    private Integer heartTime;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenActVolunteerSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenActVolunteerSummaryDTO.java
@ -0,0 +1,76 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 9、公益互助-志愿者画像
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/12 10:58
+ */
+@Data
+public class ScreenActVolunteerSummaryDTO implements Serializable {
+    private static final long serialVersionUID = 7558355410848455551L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 小于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;
+
+    /**
+     * 志愿者中男性总人数
+     */
+    private Integer maleCount;
+
+    /**
+     * 志愿者中女性总人数
+     */
+    private Integer femaleCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenBasicDataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenBasicDataResultDTO.java
@ -0,0 +1,14 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2020/9/9 17:55
+ */
+@Data
+public class ScreenBasicDataResultDTO implements Serializable {
+    private static final long serialVersionUID = -7395158916886571540L;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerAgencyDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerAgencyDTO.java
@ -0,0 +1,71 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 014、组织层级
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/17 14:21
+ */
+@Data
+public class ScreenCustomerAgencyDTO implements Serializable {
+    private static final long serialVersionUID = -4035893591086943602L;
+
+    /**
+     * 组织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(08-21新增)
+     */
+    private String dataEndTime;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerDeptDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerDeptDTO.java
@ -0,0 +1,51 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 016、部门信息上传
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/17 14:21
+ */
+@Data
+public class ScreenCustomerDeptDTO implements Serializable {
+    private static final long serialVersionUID = 238736591085431241L;
+
+    /**
+     * 部门id
+     */
+    private String deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 部门所属组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 坐标区域可空
+     */
+    private String areaMarks;
+
+    /**
+     * 中心点位
+     */
+    private String centerMark;
+
+    /**
+     * 部门所在位置
+     */
+    private String deptMark;
+
+    /**
+     * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
+     */
+    private String dataEndTime;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerGridDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerGridDTO.java
@ -0,0 +1,56 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 015、网格信息上传
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/17 14:21
+ */
+@Data
+public class ScreenCustomerGridDTO implements Serializable {
+    private static final long serialVersionUID = -4022109191573880390L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 坐标区域可空
+     */
+    private String areaMarks;
+
+    /**
+     * 中心点位
+     */
+    private String centerMark;
+
+    /**
+     * 党支部的位置！！！
+     */
+    private String partyMark;
+
+    /**
+     * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
+     */
+    private String dataEndTime;
+
+    /**
+     * 所有上级ID，用英文逗号分开(8.26新增)
+     */
+    private String allParentIds;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataDateDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataDateDTO.java
@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2020/9/10 14:51
+ */
+@Data
+public class ScreenDataDateDTO implements Serializable {
+    private static final long serialVersionUID = 8161588041384645877L;
+
+    /**
+     * 当为true时后台将先删除当前维度的数据，后新增
+     */
+    private Boolean isFirst;
+
+    /**
+     * 日期Id, 数据更新至：yyyyMMdd
+     */
+    private String dateId;
+
+    /**
+     * 上报数据
+     */
+    private Object dataList;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataMonthDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataMonthDTO.java
@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2020/9/10 14:54
+ */
+@Data
+public class ScreenDataMonthDTO implements Serializable {
+    private static final long serialVersionUID = 7415907980705272754L;
+
+    /**
+     * 当为true时后台将删除本月数据
+     */
+    private Boolean isFirst;
+
+    /**
+     * yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * 上报数据
+     */
+    private Object dataList;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupDetailDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupDetailDTO.java
@ -0,0 +1,66 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 18、邻里党群-小组详情
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/14 14:38
+ */
+@Data
+public class ScreenGroupDetailDTO implements Serializable {
+    private static final long serialVersionUID = 7564905593029547705L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 小组id
+     */
+    private String groupId;
+
+    /**
+     * 群名称
+     */
+    private String groupName;
+
+    /**
+     * 群主名称
+     */
+    private String groupLeader;
+
+    /**
+     * 群成员数
+     */
+    private Integer memberCount;
+
+    /**
+     * 话题总数
+     */
+    private Integer topicCount;
+
+    /**
+     * 转为议题的话题数
+     */
+    private Integer shiftIssueCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupSummaryDTO.java
@ -0,0 +1,61 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 17、邻里党群-各类总数汇总
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/14 14:06
+ */
+@Data
+public class ScreenGroupSummaryDTO implements Serializable {
+    private static final long serialVersionUID = -8539209478864771556L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 社群总数
+     */
+    private Integer groupCount;
+
+    /**
+     * 群成员总数
+     */
+    private Integer memberCount;
+
+    /**
+     * 话题数量
+     */
+    private Integer topicCount;
+
+    /**
+     * 话题参与量
+     */
+    private Integer partiCount;
+
+    /**
+     * 话题转议题总数
+     */
+    private Integer shiftIssueCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupTopicTrendDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenGroupTopicTrendDTO.java
@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 19、邻里党群-话题参与趋势
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/14 14:52
+ */
+@Data
+public class ScreenGroupTopicTrendDTO implements Serializable {
+    private static final long serialVersionUID = -2164297723861592814L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 话题数量(所在月新增话题数)
+     */
+    private Integer topicCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIndexDataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIndexDataResultDTO.java
@ -0,0 +1,14 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2020/9/9 17:56
+ */
+@Data
+public class ScreenIndexDataResultDTO implements Serializable {
+    private static final long serialVersionUID = 8275259571095325022L;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIssueSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIssueSummaryDTO.java
@ -0,0 +1,91 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 2、议题分析-各类总数
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/11 13:46
+ */
+@Data
+public class ScreenIssueSummaryDTO implements Serializable {
+    private static final long serialVersionUID = 5942886188159488952L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 上报总数
+     */
+    private Integer reportCount;
+
+    /**
+     * 议题总数
+     */
+    private Integer issueCount;
+
+    /**
+     * 待审核数
+     */
+    private Integer pendingCount;
+
+    /**
+     * 已驳回数
+     */
+    private Integer rejectedCount;
+
+    /**
+     * 处理中数
+     */
+    private Integer processingCount;
+
+    /**
+     * 已关闭数
+     */
+    private Integer closedCount;
+
+    /**
+     * 议题浏览数
+     */
+    private Integer issueViewCount;
+
+    /**
+     * 表态数
+     */
+    private Integer voteCount;
+
+    /**
+     * 审核通过数
+     */
+    private Integer passedCount;
+
+    /**
+     * 转化成项目数
+     */
+    private Integer shiftToProjectCount;
+
+    /**
+     * 平均审核时间单位分钟
+     */
+    private Integer avgAuditTime;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIssueTrendDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenIssueTrendDTO.java
@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 3、议题分析-参与趋势
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/11 14:35
+ */
+@Data
+public class ScreenIssueTrendDTO implements Serializable {
+    private static final long serialVersionUID = -7104188121272264513L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 议题上报数（本月内上报的议题数量）
+     */
+    private Integer reportCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsCategoryAnalysisDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsCategoryAnalysisDTO.java
@ -0,0 +1,46 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 16、党建声音-新闻按类别统计
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/14 13:22
+ */
+@Data
+public class ScreenNewsCategoryAnalysisDTO implements Serializable {
+    private static final long serialVersionUID = -3611949491638287420L;
+
+    /**
+     * 类别id
+     */
+    private String categoryId;
+
+    /**
+     * 类别名称
+     */
+    private String categoryName;
+
+    /**
+     * 新闻的数量
+     */
+    private Integer newsCount;
+
+    /**
+     * 阅读的数量
+     */
+    private Integer readCount;
+
+    /**
+     * 点赞的数量
+     */
+    private Integer likeCount;
+
+    /**
+     * 点踩的数量
+     */
+    private Integer disLikeCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsHotRankDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsHotRankDTO.java
@ -0,0 +1,31 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 15、党建声音-热度新闻排行
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/14 11:05
+ */
+@Data
+public class ScreenNewsHotRankDTO implements Serializable {
+    private static final long serialVersionUID = 8507415539266941564L;
+
+    /**
+     * 新闻id
+     */
+    private String newsId;
+
+    /**
+     * 新闻标题
+     */
+    private String newsTitle;
+
+    /**
+     * 热点值
+     */
+    private String hotCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenNewsSummaryDTO.java
@ -0,0 +1,36 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 13、党建声音-新闻各类总数汇总
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/14 10:13
+ */
+@Data
+public class ScreenNewsSummaryDTO implements Serializable {
+    private static final long serialVersionUID = 7961619640730859432L;
+
+    /**
+     * 文章总数
+     */
+    private Integer newsCount;
+
+    /**
+     * 阅读量
+     */
+    private Integer readCount;
+
+    /**
+     * 点赞量
+     */
+    private Integer likeCount;
+
+    /**
+     * 评论量
+     */
+    private Integer commentCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenPartyUserRankDataDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenPartyUserRankDataDTO.java
@ -0,0 +1,81 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 09、党建引领|基层治理-居民（党员）积分排行榜
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/14 17:07
+ */
+@Data
+public class ScreenPartyUserRankDataDTO implements Serializable {
+    private static final long serialVersionUID = -5800593872294431566L;
+
+    /**
+     * 数据更新至: yyyy|yyyyMM|yyyyMMdd
+     */
+    private String dataEndTime;
+
+    /**
+     * 组织类别 agency：组织；部门：department；网格：grid
+     */
+    private String orgType;
+
+    /**
+     * 用户所属网格id
+     */
+    private String gridId;
+
+    /**
+     * 用户所属网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String orgId;
+
+    /**
+     * 网格所属的组织名称
+     */
+    private String orgName;
+
+    /**
+     * 是否是党员标志：1是。0不是党员
+     */
+    private String partyFlag;
+
+    /**
+     * 用户Id
+     */
+    private String userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 用户积分
+     */
+    private Integer pointTotal;
+
+    /**
+     * 姓
+     */
+    private String surname;
+
+    /**
+     * 名
+     */
+    private String name;
+
+    /**
+     * 所有上级ID，用英文逗号分开(8.26新增)
+     */
+    private String allParentIds;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectCategorySummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectCategorySummaryDTO.java
@ -0,0 +1,51 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 11、项目分析-按分类统计
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/12 15:38
+ */
+@Data
+public class ScreenProjectCategorySummaryDTO implements Serializable {
+    private static final long serialVersionUID = -4004562661922372015L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 类别id
+     */
+    private String categoryId;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 项目数量
+     */
+    private Integer projectCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectStatisticAnalysisDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectStatisticAnalysisDTO.java
@ -0,0 +1,51 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 12、项目分析-满意度分析
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/14 9:57
+ */
+@Data
+public class ScreenProjectStatisticAnalysisDTO implements Serializable {
+    private static final long serialVersionUID = -7406618652293799485L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 非常满意的项目总数，增量
+     */
+    private Integer greatSatisfaction;
+
+    /**
+     * 满意的项目总数，增量
+     */
+    private Integer goodSatisfaction;
+
+    /**
+     * 不满意的项目总数
+     */
+    private Integer disSatisfaction;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenProjectSummaryDTO.java
@ -0,0 +1,76 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 10、项目分析-各类总数
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/12 14:44
+ */
+@Data
+public class ScreenProjectSummaryDTO implements Serializable {
+    private static final long serialVersionUID = -6290744006612398408L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 项目总数
+     */
+    private Integer projectCount;
+
+    /**
+     * 处理中数
+     */
+    private Integer processingCount;
+
+    /**
+     * 已关闭数
+     */
+    private Integer closedCount;
+
+    /**
+     * 流转次数
+     */
+    private Integer moveCount;
+
+    /**
+     * 已结案数量
+     */
+    private Integer closedCaseCount;
+
+    /**
+     * 项目浏览数
+     */
+    private Integer projectViewCount;
+
+    /**
+     * 项目表态数
+     */
+    private Integer voteCount;
+
+    /**
+     * 平均结案时间  单位分钟
+     */
+    private Integer avgClosedCaseTime;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenPublicDataResultDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenPublicDataResultDTO.java
@ -0,0 +1,14 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2020/9/17 14:14
+ */
+@Data
+public class ScreenPublicDataResultDTO implements Serializable {
+    private static final long serialVersionUID = -4696640703716250973L;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenUserSummaryDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenUserSummaryDTO.java
@ -0,0 +1,91 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 4、用户分析-各类总数
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/11 15:34
+ */
+@Data
+public class ScreenUserSummaryDTO implements Serializable {
+    private static final long serialVersionUID = -5366871130882672633L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 浏览用户（首页的用户总数，原型上首页是叫注册用户）
+     */
+    private Integer visitorCount;
+
+    /**
+     * 注册用户=居民数量
+     */
+    private Integer regUserCount;
+
+    /**
+     * 党员用户
+     */
+    private Integer partyCount;
+
+    /**
+     * 小于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;
+
+    /**
+     * 党员中男性总人数
+     */
+    private Integer malePartyUserCount;
+
+    /**
+     * 党员中女性总人数
+     */
+    private Integer femalePartyUserCount;
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenUserUserHeartRankDTO.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenUserUserHeartRankDTO.java
@ -0,0 +1,49 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 6、用户分析-用户趋势
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/11 17:49
+ */
+@Data
+public class ScreenUserUserHeartRankDTO implements Serializable {
+    private static final long serialVersionUID = 6419976480696892359L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 本月内新增用户数量
+     */
+    private Integer regUserCount;
+
+    /**
+     * 本月内新增党员数量
+     */
+    private Integer partyUserCount;
+
+
+
+}
--- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenVolunteerHeartRank.java
+++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenVolunteerHeartRank.java
@ -0,0 +1,61 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 5、公益互助-志愿者公益时长排名
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/11 16:13
+ */
+@Data
+public class ScreenVolunteerHeartRank implements Serializable {
+    private static final long serialVersionUID = 9071001836611815322L;
+
+    /**
+     * 所有上级ID，用英文逗号分开
+     */
+    private String allParentIds;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 所属的组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 用户id（志愿者）
+     */
+    private String userId;
+
+    /**
+     * 用户（志愿者）姓名，或者山东路-王先生，根据需求定
+     */
+    private String userName;
+
+    /**
+     * 爱心时长 单位分钟
+     */
+    private Integer heartTime;
+
+    /**
+     * 积分
+     */
+    private Integer points;
+
+    /**
+     * 志愿者ID
+     */
+    private String volunteerId;
+}
--- a/epdc-cloud-job-client/src/main/java/com/elink/esua/epdc/dto/ScreenIndexBasicDataParamDTO.java
+++ b/epdc-cloud-job-client/src/main/java/com/elink/esua/epdc/dto/ScreenIndexBasicDataParamDTO.java
@ -0,0 +1,61 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 大屏指标数据上报定时任务入参
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/15 10:50
+ */
+@Data
+public class ScreenIndexBasicDataParamDTO implements Serializable {
+    private static final long serialVersionUID = -6661828243095315569L;
+
+    /**
+     * 01、党建能力-党员相关指标上报 - 定时任务入参
+     */
+    private String gridPartyMemberData;
+
+    /**
+     * 02、党建能力-网格相关指标上报 - 定时任务入参
+     */
+    private String gridPartyAbility;
+
+    /**
+     * 03、党建能力-区街道及社区相关指标 - 定时任务入参
+     */
+    private String orgPartyAbility;
+
+    /**
+     * 04、服务能力-网格相关指标 - 定时任务入参
+     */
+    private String gridServiceAbility;
+
+    /**
+     * 05、服务能力-组织（街道|社区|全区）相关指标 - 定时任务入参
+     */
+    private String orgServiceAbility;
+
+    /**
+     * 06、治理能力-网格相关指标 - 定时任务入参
+     */
+    private String gridGovernAbility;
+
+    /**
+     * 07、治理能力-区街道及社区相关指标 - 定时任务入参
+     */
+    private String orgGovernAbility;
+
+    /**
+     * 08、治理能力-部门相关指标 - 定时任务入参
+     */
+    private String deptGovernAbility;
+
+    /**
+     * 指标数据传输完毕通知接口
+     */
+    private String all;
+}
--- a/epdc-cloud-job-client/src/main/java/com/elink/esua/epdc/dto/ScreenJobBasicDataParamDTO.java
+++ b/epdc-cloud-job-client/src/main/java/com/elink/esua/epdc/dto/ScreenJobBasicDataParamDTO.java
@ -0,0 +1,116 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 大屏基础数据上报定时任务入参
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/15 10:30
+ */
+@Data
+public class ScreenJobBasicDataParamDTO implements Serializable {
+    private static final long serialVersionUID = -8868143963953751575L;
+
+    /**
+     * 1、首页-平台各类总数上报 - 定时任务入参
+     */
+    private String homePagePlatformSummary;
+
+    /**
+     * 2、议题分析-各类总数 - 定时任务入参
+     */
+    private String issueSummary;
+
+    /**
+     * 3、议题分析-参与趋势 - 定时任务入参
+     */
+    private String issueTrend;
+
+    /**
+     * 4、用户分析-各类总数 - 定时任务入参
+     */
+    private String userSummary;
+
+    /**
+     * 5、公益互助-志愿者公益时长排名 - 定时任务入参
+     */
+    private String volunteerHeartRank;
+
+    /**
+     * 6、用户分析-用户趋势 - 定时任务入参
+     */
+    private String userUserHeartRank;
+
+    /**
+     * 7、公益互助-活动各类总数 - 定时任务入参
+     */
+    private String actSummary;
+
+    /**
+     * 8、公益互助-活动次数趋势 - 定时任务入参
+     */
+    private String actTrend;
+
+    /**
+     * 9、公益互助-志愿者画像 - 定时任务入参
+     */
+    private String actVolunteerSummary;
+
+    /**
+     * 10、项目分析-各类总数 - 定时任务入参
+     */
+    private String projectSummary;
+
+    /**
+     * 11、项目分析-按分类统计 - 定时任务入参
+     */
+    private String projectCategorySummary;
+
+    /**
+     * 12、项目分析-满意度分析 - 定时任务入参
+     */
+    private String projectStatisticAnalysis;
+
+    /**
+     * 13、党建声音-新闻各类总数汇总 - 定时任务入参
+     */
+    private String newsSummary;
+
+    /**
+     * 14、党建声音-新闻阅读参与趋势 - 定时任务入参
+     */
+    private String newsTrend;
+
+    /**
+     * 15、党建声音-热度新闻排行 - 定时任务入参
+     */
+    private String newsHotRank;
+
+    /**
+     * 16、党建声音-新闻按类别统计 - 定时任务入参
+     */
+    private String newsCategoryAnalysis;
+
+    /**
+     * 17、邻里党群-各类总数汇总 - 定时任务入参
+     */
+    private String groupSummary;
+
+    /**
+     * 18、邻里党群-小组详情 - 定时任务入参
+     */
+    private String groupDetail;
+
+    /**
+     * 19、邻里党群-话题参与趋势 - 定时任务入参
+     */
+    private String groupTopicTrend;
+
+    /**
+     * 09、党建引领|基层治理-居民（党员）积分排行榜 - 定时任务入参
+     */
+    private String partyUserRankData;
+}