deptIdList;
+
+ /**
+ * 街道id
+ */
+ private String StreetId;
}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrDeptDayDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrDeptDayDTO.java
new file mode 100644
index 0000000..88bdba5
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrDeptDayDTO.java
@@ -0,0 +1,186 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.governanceranking;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 治理排行-社区日排行
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-04-15
+ */
+@Data
+public class GrDeptDayDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 年月日(示例2020-01-01)
+ */
+ private String yearMonthDay;
+
+ /**
+ * 社区ID
+ */
+ private Long deptId;
+
+ /**
+ * 社区名称
+ */
+ private String deptName;
+
+ /**
+ * 所有部门ID
+ */
+ private String allDeptIds;
+
+ /**
+ * 所有部门名称
+ */
+ private String allDeptNames;
+
+ /**
+ * 综合评分
+ */
+ private String compositeScore;
+
+ /**
+ * 组织力提升
+ */
+ private String organizationImprovement;
+
+ /**
+ * 基层党建
+ */
+ private String basePartyBuilding;
+
+ /**
+ * 共驻共建
+ */
+ private String coOperationCoConstruction;
+
+ /**
+ * 工作评议
+ */
+ private String workReview;
+
+ /**
+ * 典型培树
+ */
+ private String typicalCase;
+
+ /**
+ * 党员群众参与度
+ */
+ private String participation;
+
+ /**
+ * 注册党员占比
+ */
+ private String registertedPartyProportion;
+
+ /**
+ * 注册群众占比
+ */
+ private String registertedPeopleProportion;
+
+ /**
+ * 注册企业占比
+ */
+ private String registertedEnterpriseProportion;
+
+ /**
+ * 吹哨事项办理
+ */
+ private String blowingMattersHanding;
+
+ /**
+ * 群众反应问题网格响应率
+ */
+ private String peopleMattersResponseRate;
+
+ /**
+ * 群众反应问题办理满意率
+ */
+ private String peopleMattersSatisfactionRate;
+
+ /**
+ * 群众满意度
+ */
+ private String peopleSatisfactionDegree;
+
+ /**
+ * 文化生活
+ */
+ private String culturalLife;
+
+ /**
+ * 环境卫生
+ */
+ private String enviromentSanitation;
+
+ /**
+ * 便民服务
+ */
+ private String convenientService;
+
+ /**
+ * 总体评价
+ */
+ private String overallEvaluation;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 删除标记(0-否，1-是)
+ */
+ private String delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrDeptMouthDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrDeptMouthDTO.java
new file mode 100644
index 0000000..f0ddc09
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrDeptMouthDTO.java
@@ -0,0 +1,186 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.governanceranking;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 治理排行-社区月排行
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-04-15
+ */
+@Data
+public class GrDeptMouthDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 年月(示例2020-01)
+ */
+ private String monthYear;
+
+ /**
+ * 社区ID
+ */
+ private Long deptId;
+
+ /**
+ * 社区名称
+ */
+ private String deptName;
+
+ /**
+ * 所有部门ID
+ */
+ private String allDeptIds;
+
+ /**
+ * 所有部门名称
+ */
+ private String allDeptNames;
+
+ /**
+ * 综合评分
+ */
+ private String compositeScore;
+
+ /**
+ * 组织力提升
+ */
+ private String organizationImprovement;
+
+ /**
+ * 基层党建
+ */
+ private String basePartyBuilding;
+
+ /**
+ * 共驻共建
+ */
+ private String coOperationCoConstruction;
+
+ /**
+ * 工作评议
+ */
+ private String workReview;
+
+ /**
+ * 典型培树
+ */
+ private String typicalCase;
+
+ /**
+ * 党员群众参与度
+ */
+ private String participation;
+
+ /**
+ * 注册党员占比
+ */
+ private String registertedPartyProportion;
+
+ /**
+ * 注册群众占比
+ */
+ private String registertedPeopleProportion;
+
+ /**
+ * 注册企业占比
+ */
+ private String registertedEnterpriseProportion;
+
+ /**
+ * 吹哨事项办理
+ */
+ private String blowingMattersHanding;
+
+ /**
+ * 群众反应问题网格响应率
+ */
+ private String peopleMattersResponseRate;
+
+ /**
+ * 群众反应问题办理满意率
+ */
+ private String peopleMattersSatisfactionRate;
+
+ /**
+ * 群众满意度
+ */
+ private String peopleSatisfactionDegree;
+
+ /**
+ * 文化生活
+ */
+ private String culturalLife;
+
+ /**
+ * 环境卫生
+ */
+ private String enviromentSanitation;
+
+ /**
+ * 便民服务
+ */
+ private String convenientService;
+
+ /**
+ * 总体评价
+ */
+ private String overallEvaluation;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 删除标记(0-否，1-是)
+ */
+ private String delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrGridDayDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrGridDayDTO.java
new file mode 100644
index 0000000..0369ae0
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrGridDayDTO.java
@@ -0,0 +1,187 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.governanceranking;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 治理排行-网格日排行
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-04-14
+ */
+@Data
+public class GrGridDayDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 年月日(示例2020-01-01)
+ */
+ private String yearMonthDay;
+
+ /**
+ * 网格ID
+ */
+ private Long gridId;
+
+ /**
+ * 网格名称
+ */
+ private String gridName;
+
+ /**
+ * 所有部门ID
+ */
+ private String allDeptIds;
+
+ /**
+ * 所有部门名称
+ */
+ private String allDeptNames;
+
+ /**
+ * 综合评分
+ */
+ private String compositeScore;
+
+ /**
+ * 组织力提升
+ */
+ private String organizationImprovement;
+
+ /**
+ * 基层党建
+ */
+ private String basePartyBuilding;
+
+ /**
+ * 共驻共建
+ */
+ private String coOperationCoConstruction;
+
+ /**
+ * 工作评议
+ */
+ private String workReview;
+
+ /**
+ * 典型培树
+ */
+ private String typicalCase;
+
+ /**
+ * 党员群众参与度
+ */
+ private String participation;
+
+ /**
+ * 注册党员占比
+ */
+ private String registertedPartyProportion;
+
+ /**
+ * 注册群众占比
+ */
+ private String registertedPeopleProportion;
+
+ /**
+ * 注册企业占比
+ */
+ private String registertedEnterpriseProportion;
+
+ /**
+ * 吹哨事项办理
+ */
+ private String blowingMattersHanding;
+
+ /**
+ * 群众反应问题网格响应率
+ */
+ private String peopleMattersResponseRate;
+
+ /**
+ * 群众反应问题办理满意率
+ */
+ private String peopleMattersSatisfactionRate;
+
+ /**
+ * 群众满意度
+ */
+ private String peopleSatisfactionDegree;
+
+ /**
+ * 文化生活
+ */
+ private String culturalLife;
+
+ /**
+ * 环境卫生
+ */
+ private String enviromentSanitation;
+
+ /**
+ * 便民服务
+ */
+ private String convenientService;
+
+ /**
+ * 总体评价
+ */
+ private String overallEvaluation;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 删除标记(0-否，1-是)
+ */
+ private String delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrGridMouthDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrGridMouthDTO.java
new file mode 100644
index 0000000..0477641
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrGridMouthDTO.java
@@ -0,0 +1,187 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.governanceranking;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 治理排行-网格月排行
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-04-14
+ */
+@Data
+public class GrGridMouthDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 年月(示例2020-01)
+ */
+ private String monthYear;
+
+ /**
+ * 网格ID
+ */
+ private Long gridId;
+
+ /**
+ * 网格名称
+ */
+ private String gridName;
+
+ /**
+ * 所有部门ID
+ */
+ private String allDeptIds;
+
+ /**
+ * 所有部门名称
+ */
+ private String allDeptNames;
+
+ /**
+ * 综合评分
+ */
+ private String compositeScore;
+
+ /**
+ * 组织力提升
+ */
+ private String organizationImprovement;
+
+ /**
+ * 基层党建
+ */
+ private String basePartyBuilding;
+
+ /**
+ * 共驻共建
+ */
+ private String coOperationCoConstruction;
+
+ /**
+ * 工作评议
+ */
+ private String workReview;
+
+ /**
+ * 典型培树
+ */
+ private String typicalCase;
+
+ /**
+ * 党员群众参与度
+ */
+ private String participation;
+
+ /**
+ * 注册党员占比
+ */
+ private String registertedPartyProportion;
+
+ /**
+ * 注册群众占比
+ */
+ private String registertedPeopleProportion;
+
+ /**
+ * 注册企业占比
+ */
+ private String registertedEnterpriseProportion;
+
+ /**
+ * 吹哨事项办理
+ */
+ private String blowingMattersHanding;
+
+ /**
+ * 群众反应问题网格响应率
+ */
+ private String peopleMattersResponseRate;
+
+ /**
+ * 群众反应问题办理满意率
+ */
+ private String peopleMattersSatisfactionRate;
+
+ /**
+ * 群众满意度
+ */
+ private String peopleSatisfactionDegree;
+
+ /**
+ * 文化生活
+ */
+ private String culturalLife;
+
+ /**
+ * 环境卫生
+ */
+ private String enviromentSanitation;
+
+ /**
+ * 便民服务
+ */
+ private String convenientService;
+
+ /**
+ * 总体评价
+ */
+ private String overallEvaluation;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 删除标记(0-否，1-是)
+ */
+ private String delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrStreetDayDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrStreetDayDTO.java
new file mode 100644
index 0000000..16ca2a5
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrStreetDayDTO.java
@@ -0,0 +1,177 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.governanceranking;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 治理排行-街道日排行
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-04-14
+ */
+@Data
+public class GrStreetDayDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 年月日(示例2020-01-01)
+ */
+ private String yearMonthDay;
+
+ /**
+ * 街道ID
+ */
+ private Long streetId;
+
+ /**
+ * 街道名称
+ */
+ private String streetName;
+
+ /**
+ * 综合评分
+ */
+ private String compositeScore;
+
+ /**
+ * 组织力提升
+ */
+ private String organizationImprovement;
+
+ /**
+ * 基层党建
+ */
+ private String basePartyBuilding;
+
+ /**
+ * 共驻共建
+ */
+ private String coOperationCoConstruction;
+
+ /**
+ * 工作评议
+ */
+ private String workReview;
+
+ /**
+ * 典型培树
+ */
+ private String typicalCase;
+
+ /**
+ * 党员群众参与度
+ */
+ private String participation;
+
+ /**
+ * 注册党员占比
+ */
+ private String registertedPartyProportion;
+
+ /**
+ * 注册群众占比
+ */
+ private String registertedPeopleProportion;
+
+ /**
+ * 注册企业占比
+ */
+ private String registertedEnterpriseProportion;
+
+ /**
+ * 吹哨事项办理
+ */
+ private String blowingMattersHanding;
+
+ /**
+ * 群众反应问题网格响应率
+ */
+ private String peopleMattersResponseRate;
+
+ /**
+ * 群众反应问题办理满意率
+ */
+ private String peopleMattersSatisfactionRate;
+
+ /**
+ * 群众满意度
+ */
+ private String peopleSatisfactionDegree;
+
+ /**
+ * 文化生活
+ */
+ private String culturalLife;
+
+ /**
+ * 环境卫生
+ */
+ private String enviromentSanitation;
+
+ /**
+ * 便民服务
+ */
+ private String convenientService;
+
+ /**
+ * 总体评价
+ */
+ private String overallEvaluation;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 删除标记(0-否，1-是)
+ */
+ private String delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrStreetMouthDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrStreetMouthDTO.java
new file mode 100644
index 0000000..0c672ad
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/GrStreetMouthDTO.java
@@ -0,0 +1,177 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.governanceranking;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 治理排行-街道月排行
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-04-14
+ */
+@Data
+public class GrStreetMouthDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 年月(示例2020-01)
+ */
+ private String monthYear;
+
+ /**
+ * 街道ID
+ */
+ private Long streetId;
+
+ /**
+ * 街道名称
+ */
+ private String streetName;
+
+ /**
+ * 综合评分
+ */
+ private String compositeScore;
+
+ /**
+ * 组织力提升
+ */
+ private String organizationImprovement;
+
+ /**
+ * 基层党建
+ */
+ private String basePartyBuilding;
+
+ /**
+ * 共驻共建
+ */
+ private String coOperationCoConstruction;
+
+ /**
+ * 工作评议
+ */
+ private String workReview;
+
+ /**
+ * 典型培树
+ */
+ private String typicalCase;
+
+ /**
+ * 党员群众参与度
+ */
+ private String participation;
+
+ /**
+ * 注册党员占比
+ */
+ private String registertedPartyProportion;
+
+ /**
+ * 注册群众占比
+ */
+ private String registertedPeopleProportion;
+
+ /**
+ * 注册企业占比
+ */
+ private String registertedEnterpriseProportion;
+
+ /**
+ * 吹哨事项办理
+ */
+ private String blowingMattersHanding;
+
+ /**
+ * 群众反应问题网格响应率
+ */
+ private String peopleMattersResponseRate;
+
+ /**
+ * 群众反应问题办理满意率
+ */
+ private String peopleMattersSatisfactionRate;
+
+ /**
+ * 群众满意度
+ */
+ private String peopleSatisfactionDegree;
+
+ /**
+ * 文化生活
+ */
+ private String culturalLife;
+
+ /**
+ * 环境卫生
+ */
+ private String enviromentSanitation;
+
+ /**
+ * 便民服务
+ */
+ private String convenientService;
+
+ /**
+ * 总体评价
+ */
+ private String overallEvaluation;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 删除标记(0-否，1-是)
+ */
+ private String delFlag;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/form/GovernanceRankingDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/form/GovernanceRankingDTO.java
new file mode 100644
index 0000000..f2e5191
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/form/GovernanceRankingDTO.java
@@ -0,0 +1,47 @@
+package com.elink.esua.epdc.dto.governanceranking.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class GovernanceRankingDTO implements Serializable {
+
+ /**
+ * 页码 -必传项
+ */
+ @NotNull(message = "页码 不能为空")
+ private Integer pageIndex;
+
+ /**
+ * 页容量 -必传项
+ */
+ @NotNull(message = "页容量 不能为空")
+ private Integer pageSize;
+
+ /**
+ * 日期类型（0-日、1-月、2-年） -必传项
+ */
+ @NotNull(message = "日期类型 不能为空")
+ private String dateType;
+
+ /**
+ * 排序类型（0-综合排行、1-组织力提升、2-党员群众参与度、3-吹哨事项办理、4-群众满意度） -必传项
+ *
+ */
+ @NotNull(message = "排序类型 不能为空")
+ private String orderType;
+
+ /**
+ * 查询日期（格式：yyyy或yyyy-mm或yyyy-mm-dd） -必传项
+ */
+ @NotNull(message = "查询日期 不能为空")
+ private String searchDate;
+
+ /**
+ * 用户所在的 街道id
+ */
+ private List deptIdList;
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/result/GovernanceRankingResultDataDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/result/GovernanceRankingResultDataDTO.java
new file mode 100644
index 0000000..e239816
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/result/GovernanceRankingResultDataDTO.java
@@ -0,0 +1,51 @@
+package com.elink.esua.epdc.dto.governanceranking.result;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class GovernanceRankingResultDataDTO implements Serializable {
+
+ /**
+ * ID
+ */
+ private String id;
+
+ /**
+ * 街道ID
+ */
+ private Long deptId;
+
+ /**
+ * 街道名称
+ */
+ private String deptName;
+
+ /**
+ * 综合得分
+ */
+ private String complexScore;
+
+ /**
+ * 组织力提升得分
+ */
+ private String organizationScore;
+
+ /**
+ * 党员群众参与度得分
+ */
+ private String partyMembersParticipationScore;
+
+ /**
+ * 吹哨事项办理得分
+ */
+ private String whistleMattersScore;
+
+ /**
+ * 群众满意度得分
+ */
+ private String massSatisfactionScore;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/result/GovernanceRankingResultDetailDataDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/result/GovernanceRankingResultDetailDataDTO.java
new file mode 100644
index 0000000..6074e3d
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/governanceranking/result/GovernanceRankingResultDetailDataDTO.java
@@ -0,0 +1,115 @@
+package com.elink.esua.epdc.dto.governanceranking.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class GovernanceRankingResultDetailDataDTO implements Serializable {
+
+ /**
+ * ID
+ */
+ private String id;
+
+ /**
+ * 街道名称
+ */
+ private String deptName;
+
+ /**
+ * 查询日期
+ */
+ private String searchDate;
+
+ /**
+ * 综合得分
+ */
+ private String complexScore;
+
+ /**
+ * 组织力提升得分
+ */
+ private String organizationScore;
+
+ /**
+ * 基层党建得分
+ */
+ private String grassrootsPartyBuildScore;
+
+ /**
+ * 共驻共建得分
+ */
+ private String coResidentScore;
+
+ /**
+ * 工作评议得分
+ */
+ private String jobReviewScore;
+
+ /**
+ * 典型培树得分
+ */
+ private String typicalTrainingScore;
+
+ /**
+ * 党员群众参与度得分
+ */
+ private String partyMembersParticipationScore;
+
+ /**
+ * 注册党员占比得分
+ */
+ private String registeredPartyScore;
+
+ /**
+ * 注册群众占比得分
+ */
+ private String registeredCrowdScore;
+
+ /**
+ * 注册企业占比得分
+ */
+ private String registeredCompanyScore;
+
+ /**
+ * 吹哨事项办理得分
+ */
+ private String whistleMattersScore;
+
+ /**
+ * 群众反应问题网格响应率得分
+ */
+ private String gridResponseRateScore;
+
+ /**
+ * 群众反应问题办理满意率得分
+ */
+ private String satisfactionRateScore;
+
+ /**
+ * 群众满意度得分
+ */
+ private String massSatisfactionScore;
+
+ /**
+ * 文化生活得分
+ */
+ private String culturalLifeScore;
+
+ /**
+ * 环境卫生得分
+ */
+ private String environmentalHealthScore;
+
+ /**
+ * 便民服务得分
+ */
+ private String convenienceServiceScore;
+
+ /**
+ * 总体评价得分
+ */
+ private String overallEvaluationScore;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/group/form/GroupDynamicConditionFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/group/form/GroupDynamicConditionFormDTO.java
index ab8075d..d861187 100644
--- a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/group/form/GroupDynamicConditionFormDTO.java
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/group/form/GroupDynamicConditionFormDTO.java
@@ -30,4 +30,9 @@ public class GroupDynamicConditionFormDTO implements Serializable {
* 部门ID列表
*/
List deptIdList;
+
+ /**
+ * 街道id
+ */
+ private String StreetId;
}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/MetaItemEvaluateDeptDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/MetaItemEvaluateDeptDTO.java
index 5e91844..732d03f 100644
--- a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/MetaItemEvaluateDeptDTO.java
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/MetaItemEvaluateDeptDTO.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.dto.item.result;
import java.io.Serializable;
import java.util.Date;
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterNoticeDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterNoticeDTO.java
old mode 100755
new mode 100644
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterNoticeImgDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterNoticeImgDTO.java
old mode 100755
new mode 100644
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterNoticeUserReadDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterNoticeUserReadDTO.java
old mode 100755
new mode 100644
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicCommentDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicCommentDTO.java
old mode 100755
new mode 100644
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicCommentUserAttitudeDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicCommentUserAttitudeDTO.java
old mode 100755
new mode 100644
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicDTO.java
old mode 100755
new mode 100644
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicImgDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicImgDTO.java
old mode 100755
new mode 100644
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicUserAttitudeDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicUserAttitudeDTO.java
old mode 100755
new mode 100644
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicUserBrowseDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterTopicUserBrowseDTO.java
old mode 100755
new mode 100644
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterUserRelationDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/master/MasterUserRelationDTO.java
old mode 100755
new mode 100644
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/AnalysisOfBranchDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/AnalysisOfBranchDTO.java
new file mode 100644
index 0000000..40f8345
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/AnalysisOfBranchDTO.java
@@ -0,0 +1,23 @@
+package com.elink.esua.epdc.dto.party;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author: qushutong
+ * @Date: 2020/4/16 14:20
+ * @Description: 支部建设—支部活动—支部活动统计分析+联建共建—联建共建开展情况 临时输出
+ */
+@Data
+public class AnalysisOfBranchDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private String categoryName;
+
+ private Integer organizationsCount;
+
+ private Integer joinNum;
+
+ private Integer averageNum;
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseCategoryDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseCategoryDTO.java
new file mode 100644
index 0000000..0305bab
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseCategoryDTO.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党员实况分布种类表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCaseCategoryDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 分类概述
+ */
+ private String categoryInfo;
+
+ /**
+ * 党员总数
+ */
+ private Long parytAmount;
+
+ /**
+ * (0:党员年龄分布 1：党员职业分布)
+ */
+ private String type;
+
+ /**
+ * 删除标识 0：否，1：是
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseDisrtibutionDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseDisrtibutionDTO.java
new file mode 100644
index 0000000..bbdd629
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseDisrtibutionDTO.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党员实况分布表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCaseDisrtibutionDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 分布信息名称
+ */
+ private String distributionName;
+
+ /**
+ * 分布数
+ */
+ private Long distributionInfoCount;
+
+ /**
+ * 分布占比
+ */
+ private BigDecimal distributionInfoPercent;
+
+ /**
+ * (0:党员年龄分布 1：党员职业分布)
+ */
+ private String type;
+
+ /**
+ * 相关信息ID
+ */
+ private String categoryId;
+
+ /**
+ * 删除标识 0：否，1：是
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseNumberDTO.java
similarity index 55%
rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseNumberDTO.java
index c3b3d37..5dad9f4 100644
--- a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseNumberDTO.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.elink.esua.epdc.dto.user;
+package com.elink.esua.epdc.dto.party;
import java.io.Serializable;
import java.util.Date;
@@ -23,13 +23,13 @@ import lombok.Data;
/**
- * 网格开通情况
+ * 党员人数实况表
*
- * @author qu elink@elink-cn.com
- * @since v1.0.0 2020-03-25
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
*/
@Data
-public class MetaUserGridOpiningDTO implements Serializable {
+public class PartyCaseNumberDTO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -39,82 +39,37 @@ public class MetaUserGridOpiningDTO implements Serializable {
private String id;
/**
- * 网格id
+ * 党员数占比
*/
- private String gridId;
-
- /**
- * 用户总数
- */
- private int registerCount;
+ private Long partyCountPercent;
/**
* 党员数
*/
- private int partyCount;
-
- /**
- * 已注册居民
- */
- private int residentCount;
-
- /**
- * 未注册居民
- */
- private int unAuthorizedCount;
-
- /**
- * 新闻发布数
- */
- private int newsCount;
-
- /**
- * 社群数
- */
- private int communityCount;
-
- /**
- * 群成员数
- */
- private int communityMemberCount;
-
- /**
- * 群话题数
- */
- private int communityTopicCount;
-
- /**
- * 议题总数
- */
- private int eventCount;
-
- /**
- * 项目数
- */
- private int itemCount;
+ private Long partyCount;
/**
- * 项目已解决数
+ * 分类ID
*/
- private int itemCloseCount;
+ private String categoryId;
/**
- * 好评数
+ * 街道名称
*/
- private int itemPraiseCount;
+ private String streetName;
/**
- * 网格名称
+ * 街道ID
*/
- private String allDeptName;
+ private Long streetId;
/**
- * 网格党建指导员姓名
+ * 排序
*/
- private String gridLeader;
+ private Integer sort;
/**
- * 删除标记
+ * 删除标识 0：否，1：是
*/
private String delFlag;
@@ -129,7 +84,7 @@ public class MetaUserGridOpiningDTO implements Serializable {
private String createdBy;
/**
- * 注册时间
+ * 创建时间
*/
private Date createdTime;
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseViewDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseViewDTO.java
new file mode 100644
index 0000000..927e08d
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyCaseViewDTO.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 党员实况分布种类表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCaseViewDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 党员实况分布种类表
+ */
+ private List partyCaseCategoryDTOList;
+ /**
+ * 党员实况分布表
+ */
+ private List partyCaseDisrtibutionDTOList;
+ /**
+ * 党员人数实况表
+ */
+ private List partyCaseNumberDTOList;
+}
\ No newline at end of file
diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyParticipateStatisticsDTO.java
similarity index 65%
rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java
rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyParticipateStatisticsDTO.java
index be8c514..7dce495 100644
--- a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyParticipateStatisticsDTO.java
@@ -15,22 +15,21 @@
* along with this program. If not, see .
*/
-package com.elink.esua.epdc.dto.user;
+package com.elink.esua.epdc.dto.party;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
-import java.math.BigDecimal;
/**
- * 党员排行
+ * 用户/党员参与人次/人数
*
- * @author qu elink@elink-cn.com
- * @since v1.0.0 2020-03-26
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-04-18
*/
@Data
-public class MetaUserPartyRankDTO implements Serializable {
+public class PartyParticipateStatisticsDTO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -42,7 +41,7 @@ public class MetaUserPartyRankDTO implements Serializable {
/**
* 街道id
*/
- private String streetId;
+ private Long streetId;
/**
* 街道名称
@@ -50,52 +49,52 @@ public class MetaUserPartyRankDTO implements Serializable {
private String streetName;
/**
- * 已注册党员数量（已认证）
+ * 社区id
*/
- private Integer partyMemberCount;
+ private Long communityId;
/**
- * 年龄超过50岁党员数量
+ * 社区名称
*/
- private Integer oldCount;
+ private String communityName;
/**
- * 老龄化比例
+ * 党员数量
*/
- private BigDecimal oldPercent;
+ private Integer partyAmount;
/**
- * 年龄50岁以下的党员数量
+ * 党员参与人次
*/
- private Integer youngCount;
+ private Integer partyBehaviorTimes;
/**
- * 年轻化比例
+ * 党员参与人数
*/
- private BigDecimal youngPercent;
+ private Integer partyBehaviorAmount;
/**
- * 男
+ * 用户数量
*/
- private Integer maleCount;
+ private Integer userAmount;
/**
- * 女
+ * 用户参与人次
*/
- private Integer femaleCount;
+ private Integer userBehavoirTimes;
/**
- * 未知性别
+ * 用户参与人数
*/
- private Integer unknownSexCount;
+ private Integer userBehavoirAmount;
/**
- * 党员认证失败数
+ * 数据所属日期
*/
- private Integer partyAuthFailureCount;
+ private Date statisticsDate;
/**
- * 删除标记
+ * 删除标识 0：否，1：是
*/
private String delFlag;
@@ -110,7 +109,7 @@ public class MetaUserPartyRankDTO implements Serializable {
private String createdBy;
/**
- * 注册时间
+ * 创建时间
*/
private Date createdTime;
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyWorkCategoryDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyWorkCategoryDTO.java
new file mode 100644
index 0000000..269a724
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyWorkCategoryDTO.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党建实况-工作活动类别
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-04-15
+ */
+@Data
+public class PartyWorkCategoryDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 父类别id
+ */
+ private String pid;
+
+ /**
+ * 类别编码
+ */
+ private String code;
+
+ /**
+ * 类别名称
+ */
+ private String name;
+
+ /**
+ * 删除标识 0：否，1：是
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyWorkSituationDTO.java
similarity index 62%
rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java
rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyWorkSituationDTO.java
index 52f3b71..e841cc8 100644
--- a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/PartyWorkSituationDTO.java
@@ -15,7 +15,7 @@
* along with this program. If not, see .
*/
-package com.elink.esua.epdc.dto.user;
+package com.elink.esua.epdc.dto.party;
import java.io.Serializable;
import java.util.Date;
@@ -24,13 +24,13 @@ import lombok.Data;
import java.math.BigDecimal;
/**
- * 用户注册排行
+ * 党建实况-工作活动表
*
- * @author qu elink@elink-cn.com
- * @since v1.0.0 2020-03-26
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-04-15
*/
@Data
-public class MetaUserRegisterRankDTO implements Serializable {
+public class PartyWorkSituationDTO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -40,72 +40,47 @@ public class MetaUserRegisterRankDTO implements Serializable {
private String id;
/**
- * 街道id
- */
- private String streetId;
-
- /**
- * 街道名称
+ * 统计时间（活动举办时间）
*/
- private String streetName;
+ private Date statisticsDate;
/**
- * 用户总数
+ * 工作活动类别
*/
- private Integer userCount;
+ private String workCategoryCode;
/**
- * 党员数
- */
- private Integer partyMemberCount;
-
- /**
- * 已注册居民
- */
- private Integer residentCount;
-
- /**
- * 为注册居民
- */
- private Integer unAuthorizedCount;
-
- /**
- * 年龄超过50岁
- */
- private Integer oldCount;
-
- /**
- * 老龄化比例
+ * 街道名称
*/
- private BigDecimal oldPercent;
+ private String streetName;
/**
- * 50岁以下用户数量
+ * 社区名称
*/
- private Integer youngCount;
+ private String communityName;
/**
- * 年轻化比例
+ * 参与人数
*/
- private BigDecimal youngPercent;
+ private Integer joinNum;
/**
- * 男
+ * 资金整合
*/
- private Integer maleCount;
+ private BigDecimal fundsIntegration;
/**
- * 女
+ * 街道id
*/
- private Integer femaleCount;
+ private Long streetId;
/**
- * 未知性别
+ * 社区id
*/
- private Integer unknownSexCount;
+ private Long communityId;
/**
- * 删除标记
+ * 删除标识 0：否，1：是
*/
private String delFlag;
@@ -120,7 +95,7 @@ public class MetaUserRegisterRankDTO implements Serializable {
private String createdBy;
/**
- * 注册时间
+ * 创建时间
*/
private Date createdTime;
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/AnalysisOfBranchFromDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/AnalysisOfBranchFromDTO.java
new file mode 100644
index 0000000..91e6846
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/AnalysisOfBranchFromDTO.java
@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.dto.party.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: qushutong
+ * @Date: 2020/4/15 18:16
+ * @Description: 支部建设—支部活动—支部活动统计分析+联建共建—联建共建开展情况
+ */
+@Data
+public class AnalysisOfBranchFromDTO implements Serializable {
+
+ private static final long serialVersionUID = 5663940548747204063L;
+ /***
+ * 街道id(""不填默认所有)
+ */
+ private String streetId;
+
+ /***
+ * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年 ,""不填默认全部）
+ */
+ private String someMonthsType;
+
+ /***
+ * 0:支部建设；1：联建工件
+ */
+ @NotBlank(message = "类型不能为空")
+ private String categoryType;
+
+ /**
+ * 部门数据权限
+ */
+ private List deptIdList;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/DeptAnalysisOfBranchFromDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/DeptAnalysisOfBranchFromDTO.java
new file mode 100644
index 0000000..34a735b
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/DeptAnalysisOfBranchFromDTO.java
@@ -0,0 +1,46 @@
+package com.elink.esua.epdc.dto.party.form;
+
+import com.elink.esua.epdc.dto.organize.result.StreetListResultDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: qushutong
+ * @Date: 2020/4/16 19:31
+ * @Description: 1.支部建设—支部活动—支部活动统计分析（具体街道社区）+
+ * 2.主题当日与三述专题—主题党日与三述专题召开情况+
+ * 3.支部建设-组织党员培训学习-组织党员参加培训学习情况+
+ * 4.联建共建
+ */
+@Data
+public class DeptAnalysisOfBranchFromDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+
+ /***
+ *
+ *街道id(""不填默认所有)
+ */
+ private String streetId;
+
+ /***
+ *数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年 ,""不填默认全部）
+ *
+ */
+ private String someMonthsType;
+ /***
+ *工作种类（主题党日：12；三会一课：11；党员志愿者服务：14；党内关怀帮助：15；培训学习：16；”三述“专题：13；省级.市级和区直机关：21；驻区企业事业单位：23；驻区“两新组织”24）
+ *
+ */
+ @NotBlank(message = "分类类别不能为空")
+ private String categoryCode;
+
+ /**
+ * 社区 或街道 id name
+ */
+ private List streetListResultDTOS;
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/PartyCasePartyJoinFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/PartyCasePartyJoinFormDTO.java
new file mode 100644
index 0000000..1c5efdf
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/PartyCasePartyJoinFormDTO.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 党员实况分布比例表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCasePartyJoinFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 街道id
+ */
+ private String streetId;
+
+ /**
+ * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年 ,""不填默认全部）
+ */
+ private String someMonthsType;
+
+ /**
+ * 部门ids
+ */
+ private List deptIdList;
+
+ /**
+ * 排序 0 倒叙 1正序
+ */
+ @NotBlank(message = "排序 0 倒叙 1正序")
+ private String order;
+
+ /**
+ * 党员活跃人数0；党员互动次数1；党员发布话题数2；党员发布议题数3；议题转项目数4；解决项目数5；党员建群数6；
+ */
+ @NotBlank(message = "党员活跃人数0；党员互动次数1；党员发布话题数2；党员发布议题数3；议题转项目数4；解决项目数5；党员建群数6；")
+ private String orderBy;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/PartyCaseRatioFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/PartyCaseRatioFormDTO.java
new file mode 100644
index 0000000..c5df37e
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/PartyCaseRatioFormDTO.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 党员实况分布比例表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCaseRatioFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 街道id
+ */
+ private String streetId;
+
+ /**
+ * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年 ,""不填默认全部）
+ */
+ private String someMonthsType;
+
+ /**
+ * 部门ids
+ */
+ private List deptIdList;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/RankingWorkFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/RankingWorkFormDTO.java
new file mode 100644
index 0000000..e4078f6
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/RankingWorkFormDTO.java
@@ -0,0 +1,57 @@
+package com.elink.esua.epdc.dto.party.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 联建共建 + 支部建设 模块的 请求入参
+ * 1.支部建设-主题党日与三述专题-主题党日与三述专题排名 + 2.支部建设-组织党员培训学习排名
+ * 3.联建共建-联建共建开展情况排名 + 4.党员先锋-党员作用发挥情况-党员作用发挥情况排名
+ * @author lvxinyang
+ */
+@Data
+public class RankingWorkFormDTO implements Serializable{
+
+ /**
+ * 街道id（不填默认全部）
+ */
+ private String streetId;
+
+ /**
+ * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年 ,""不填默认全部）
+ */
+ private String someMonthsType;
+
+ /**
+ * 0倒叙 1正序
+ */
+ @NotNull(message = "查询顺序不能为空")
+ private String order;
+
+ /**
+ * 排序条件
+ */
+ @NotNull(message = "检索条件不能为空")
+ private String type;
+
+
+ /**
+ * 街道的所有社区
+ */
+ private List allCommunityIds;
+
+ /**
+ * 要查询的所有工作活动类型 CODE
+ */
+ private List categoryCodes;
+
+
+ /**
+ * 用户的部门数据权限
+ */
+ private List deptIdList;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/ResourceAmountFromDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/ResourceAmountFromDTO.java
new file mode 100644
index 0000000..e02b343
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/ResourceAmountFromDTO.java
@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.dto.party.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: qushutong
+ * @Date: 2020/4/15 18:16
+ * @Description: 支部建设—支部活动—支部活动统计分析+联建共建—联建共建开展情况
+ */
+@Data
+public class ResourceAmountFromDTO implements Serializable {
+
+ private static final long serialVersionUID = 5663940548747204063L;
+ /***
+ * 街道id(""不填默认所有)
+ */
+ private String streetId;
+
+ /***
+ * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年 ,""不填默认全部）
+ */
+ private String someMonthsType;
+
+
+ /**
+ * 部门数据权限
+ */
+ private List deptIdList;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/partyDistributionFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/partyDistributionFormDTO.java
new file mode 100644
index 0000000..da3a719
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/form/partyDistributionFormDTO.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 党员实况分布比例表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class partyDistributionFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 0：党员年龄分布 1：党员职业分布
+ */
+ @NotBlank(message = "0：党员年龄分布 1：党员职业分布")
+ private String categoryType;
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/AnalysisOfBranchResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/AnalysisOfBranchResultDTO.java
new file mode 100644
index 0000000..62e666a
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/AnalysisOfBranchResultDTO.java
@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: qushutong
+ * @Date: 2020/4/15 18:23
+ * @Description: 支部建设—支部活动—支部活动统计分析+联建共建—联建共建开展情况
+ */
+@Data
+public class AnalysisOfBranchResultDTO implements Serializable {
+ private static final long serialVersionUID = 5657970916763345463L;
+
+ /***
+ * 组织活动总次数
+ */
+ private Integer allOrganizationsCount;
+ /***
+ * 参与人数总次数
+ */
+ private Integer allJoinNumCount;
+ /***
+ * 下标分类
+ */
+ private List categoryList;
+ /***
+ * 组织次数
+ */
+ private List organizationsCountList;
+ /***
+ * 参与人数总次数
+ */
+ private List joinNumList;
+ /***
+ * 平均次数
+ */
+ private List averageNum;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/CategoryInfoListResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/CategoryInfoListResultDTO.java
new file mode 100644
index 0000000..d829515
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/CategoryInfoListResultDTO.java
@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.dto.party.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 分类清单
+ *
+ * 联建共建 + 支部建设 模块中请求出参 data 的原型对象streetList 中的 categoryInfoList 原型对象
+ * 1.支部建设-主题党日与三述专题-主题党日与三述专题排名 + 2.支部建设-组织党员培训学习排名
+ * 3.联建共建-联建共建开展情况排名 + 4.党员先锋-党员作用发挥情况-党员作用发挥情况排名
+ * @author lvxinyang
+ */
+@Data
+public class CategoryInfoListResultDTO implements Serializable{
+
+ /**
+ * 组织人次
+ */
+ private String organizationsCount;
+
+ /**
+ * 参与人数
+ */
+ private String joinNum;
+
+ /**
+ * 种类名称
+ */
+ private String categoryName;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/DeptAnalysisOfBranchDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/DeptAnalysisOfBranchDTO.java
new file mode 100644
index 0000000..d5bf415
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/DeptAnalysisOfBranchDTO.java
@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author: qushutong 临时文件
+ * @Date: 2020/4/16 14:20
+ * @Description: 1.支部建设—支部活动—支部活动统计分析（具体街道社区）+2.主题当日与三述专题—主题党日与三述专题召开情况+
+ * 3.支部建设-组织党员培训学习-组织党员参加培训学习情况+4.联建共建 接口
+ */
+@Data
+public class DeptAnalysisOfBranchDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private Integer organizationsCount;
+
+ private Integer joinNum;
+
+ private Integer averageNum;
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/DeptAnalysisOfBranchResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/DeptAnalysisOfBranchResultDTO.java
new file mode 100644
index 0000000..6a4d5db
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/DeptAnalysisOfBranchResultDTO.java
@@ -0,0 +1,36 @@
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: qushutong
+ * @Date: 2020/4/17 11:02
+ * @Description: 1.支部建设—支部活动—支部活动统计分析（具体街道社区）+2.主题当日与三述专题—主题党日与三述专题召开情况+
+ * 3.支部建设-组织党员培训学习-组织党员参加培训学习情况+4.联建共建
+ */
+@Data
+public class DeptAnalysisOfBranchResultDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+
+ /**
+ * organizationsCountList : [690,720,780,840,1024,1180,1120,690,720,780,840,1024,1180,1120,690,720,780,840,1024,1180]
+ * joinNumList : [820,932,901,934,1290,1330,1320,820,932,901,934,1290,1330,1320,820,932,901,934,1290,1330]
+ * averageNum : [430,520,580,640,890,1024,900,430,520,580,640,890,1024,900,430,520,580,640,890,1024]
+ * categoryList : ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月","十三月","十四月","十五月","十六月","十七月","十八月","十九月","二十月"]
+ * allAnizationsCount : 63446
+ * allJoinNum : 96989
+ */
+
+ private int allAnizationsCount;
+ private int allJoinNum;
+ private List organizationsCountList;
+ private List joinNumList;
+ private List averageNum;
+ private List categoryList;
+ private String deptNum;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/DisrtibutionResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/DisrtibutionResultDTO.java
new file mode 100644
index 0000000..0f84815
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/DisrtibutionResultDTO.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 党员实况分布表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class DisrtibutionResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分布信息名称
+ */
+ private String categoryInfo;
+
+ /**
+ * 分布数
+ */
+ private List data;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/NumberResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/NumberResultDTO.java
new file mode 100644
index 0000000..b5da168
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/NumberResultDTO.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 党员人数实况表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class NumberResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分布信息名称
+ */
+ private String categoryInfo;
+
+ /**
+ * 街道名
+ */
+ private List streetNameList;
+
+ /**
+ * 数量
+ */
+ private List partyCountList;
+
+ /**
+ * 占比
+ */
+ private List partyCountPercentList;
+
+ /**
+ * 分布信息名称
+ */
+ private String deptNum;
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseAgeResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseAgeResultDTO.java
new file mode 100644
index 0000000..5a33ecd
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseAgeResultDTO.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 党员实况分布比例表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCaseAgeResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 平均年龄
+ */
+ private Integer averageAge;
+
+ /**
+ * 年龄分布
+ */
+ private List ageList;
+
+ /**
+ * 党员数
+ */
+ private List partyCountList;
+
+ /**
+ * 占比
+ */
+ private List partyPercentList;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseDisrtibutionResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseDisrtibutionResultDTO.java
new file mode 100644
index 0000000..8248163
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseDisrtibutionResultDTO.java
@@ -0,0 +1,54 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * 党员实况分布表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCaseDisrtibutionResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分布信息名称
+ */
+ private String distributionName;
+
+ /**
+ * 分布数
+ */
+ private Long distributionInfoCount;
+
+ /**
+ * 分布占比
+ */
+ private BigDecimal distributionInfoPercent;
+
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseNumberResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseNumberResultDTO.java
new file mode 100644
index 0000000..f408516
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseNumberResultDTO.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 党员人数实况表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCaseNumberResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 党员数占比
+ */
+ private String partyCountPercent;
+
+ /**
+ * 党员数
+ */
+ private String partyCount;
+
+ /**
+ * 街道名称
+ */
+ private String streetName;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCasePartyJoinDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCasePartyJoinDTO.java
new file mode 100644
index 0000000..39d6dba
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCasePartyJoinDTO.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 党员实况分布比例表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCasePartyJoinDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 社区街道名
+ */
+ private String deptName;
+
+ /**
+ * 党员活跃人次
+ */
+ private Integer behaviorTimes;
+
+ /**
+ * 党员建社群数
+ */
+ private Integer groupAmount;
+
+ /**
+ * 群成员数
+ */
+ private Integer groupUserTotal;
+
+ /**
+ * 党员议事互动次数
+ */
+ private Integer eventsBehaviorTimes;
+
+ /**
+ * 党员发布话题数
+ */
+ private Integer topicPublishTimes;
+
+ /**
+ * 党员发布议题数
+ */
+ private Integer EventsPublishTimes;
+
+ /**
+ * 议题转项目数
+ */
+ private Integer toItemTimes;
+
+ /**
+ * 解决项目数
+ */
+ private Integer finishTimes;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCasePartyJoinResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCasePartyJoinResultDTO.java
new file mode 100644
index 0000000..8ab1310
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCasePartyJoinResultDTO.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 党员实况分布比例表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCasePartyJoinResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 街道名称或者社区名称
+ */
+ private String deptname;
+
+ /**
+ *
+ */
+ private List groupAmount;
+
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseRatioDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseRatioDTO.java
new file mode 100644
index 0000000..692054a
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseRatioDTO.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 党员实况分布比例表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCaseRatioDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分布标识
+ */
+ private String mark;
+
+ /**
+ * 分布标识描述
+ */
+ private String markDescribe;
+
+ /**
+ * 分布数量
+ */
+ private Integer num;
+
+ /**
+ * 分布数量占比
+ */
+ private String percent;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseRegistrationResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseRegistrationResultDTO.java
new file mode 100644
index 0000000..eca269c
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyCaseRegistrationResultDTO.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 党员实况分布比例表
+ *
+ * @author zhangyuan qu@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class PartyCaseRegistrationResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 党员注册人数
+ */
+ private Integer registeredMemberCount;
+
+ /**
+ * 党员已注册人数占比
+ */
+ private String registeredMemberCountPercent;
+
+ /**
+ * 占总党员数比
+ */
+ private String percentInTotal;
+
+ /**
+ * 占注册人数比
+ */
+ private String percentInUser;
+ /**
+ * 未注册人数
+ */
+ private Integer unRegisteredMemberCount;
+
+ /**
+ * 未注册人数占比
+ */
+ private String unRegisteredMemberCountPercent;
+
+ /**
+ * 辖区街道总党员数
+ */
+ private Integer partyCount;
+
+ /**
+ * 男
+ */
+ private Integer male;
+
+ /**
+ * 女
+ */
+ private Integer female;
+
+ /**
+ * 性别未知
+ */
+ private Integer unknowGender;
+
+ /**
+ * 男占比
+ */
+ private String malePercent;
+
+ /**
+ * 女占比
+ */
+ private String femalePercent;
+
+ /**
+ * 未知性别占比
+ */
+ private String unknowGenderPercent;
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyLeadingInfoResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyLeadingInfoResultDTO.java
new file mode 100644
index 0000000..426ab76
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyLeadingInfoResultDTO.java
@@ -0,0 +1,47 @@
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author: qushutong
+ * @Date: 2020/4/18 11:10
+ * @Description:
+ */
+@Data
+public class PartyLeadingInfoResultDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+
+ /**
+ * partyCreateGroupCount : 200
+ * toItemPercent : 45
+ * finishPercent : 62
+ * partyParticipateAmount : 81207
+ * partyPercentByUserAmount : dJrzpB8I8b
+ * partyPercentByPartyAmount : 5Opeo6dJJq
+ * groupPersonNumber : 6000
+ * topicPercent : eVkEQMxcww
+ * topicAmount : 84986
+ * toItem : 20774
+ * event : 70417
+ * eventPercent : 30
+ * finish : 19286
+ */
+
+ private int partyCreateGroupCount;
+ private String toItemPercent;
+ private String finishPercent;
+ private int partyParticipateAmount;
+ private String partyPercentByUserAmount;
+ private String partyPercentByPartyAmount;
+ private int groupPersonNumber;
+ private String topicPercent;
+ private int topicAmount;
+ private int toItem;
+ private int event;
+ private String eventPercent;
+ private int finish;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyWorkStreetListResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyWorkStreetListResultDTO.java
new file mode 100644
index 0000000..d0ab728
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/PartyWorkStreetListResultDTO.java
@@ -0,0 +1,37 @@
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 联建共建 + 支部建设 模块中请求出参 data 的原型对象streetList
+ * 1.支部建设-主题党日与三述专题-主题党日与三述专题排名 + 2.支部建设-组织党员培训学习排名
+ * 3.联建共建-联建共建开展情况排名 + 4.党员先锋-党员作用发挥情况-党员作用发挥情况排名
+ * @author lvxinyang
+ */
+@Data
+public class PartyWorkStreetListResultDTO implements Serializable{
+
+ /**
+ * 部门姓名
+ */
+ private String deptname;
+
+ /**
+ * 参与活动人总数
+ */
+ private String allJoinNumCount;
+
+ /**
+ * 组织活动总次数
+ */
+ private String allOrganizationsCount;
+
+ /**
+ * 分类清单
+ */
+ private List categoryInfoList;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/ResourceAmountResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/ResourceAmountResultDTO.java
new file mode 100644
index 0000000..4158c8f
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/party/result/ResourceAmountResultDTO.java
@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.dto.party.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ResourceAmountResultDTO implements Serializable {
+
+ /**
+ * resourceAmountTotal : 2986 资金整合总额
+ * resourceTimes : 10 整合资源次数
+ * averageAmount : 298 平均每次整合金额
+ */
+
+ private Integer resourceAmountTotal;
+ private Integer resourceTimes;
+ private Integer averageAmount;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/AllDynamicStatisticsFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/AllDynamicStatisticsFormDTO.java
index ef01b51..81975c1 100644
--- a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/AllDynamicStatisticsFormDTO.java
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/AllDynamicStatisticsFormDTO.java
@@ -22,4 +22,14 @@ public class AllDynamicStatisticsFormDTO implements Serializable {
* 部门数据权限
*/
private List deptIdList;
+
+ /**
+ * 街道id
+ */
+ private String streetId;
+
+ /**
+ *数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）
+ */
+ private String someMonthsType;
}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/DynamicPercentFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/DynamicPercentFormDTO.java
index ce44489..3e0b172 100644
--- a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/DynamicPercentFormDTO.java
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/DynamicPercentFormDTO.java
@@ -12,22 +12,16 @@ import java.util.List;
@Data
public class DynamicPercentFormDTO implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1367964306028913699L;
/**
*部门id
*/
private String deptId;
/**
- *数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）
+ *数据时间类型（0:全部，1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）
*/
@NotBlank(message = "数据时间类型不能为空")
private String someMonthsType;
- /**
- *分析类型:1.平台，2.声音，3.议事，4.社群
- */
- @NotBlank(message = "分析类型不能为空")
- private String analysisType;
-
/**
* 时间
*/
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/PartyRankFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/PartyRankFormDTO.java
new file mode 100644
index 0000000..fe42902
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/PartyRankFormDTO.java
@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.dto.user.form;
+
+import com.elink.esua.epdc.dto.organize.result.StreetListResultDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: qushutong
+ * @Date: 2020/4/14 14:09
+ * @Description: 党员排行入参
+ */
+@Data
+public class PartyRankFormDTO implements Serializable {
+ private static final long serialVersionUID = 7731396287395266744L;
+
+ /**
+ * streetId : 80248
+ * order : soOeI5oWPc 排序 0 倒叙 1正序
+ */
+
+ private String streetId;
+
+ @NotBlank(message = "排序规则不能为空")
+ private String order;
+
+ /**
+ * 社区 或街道 id name
+ */
+ private List streetListResultDTOS;
+
+ /**
+ * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年 ,""不填默认全部）
+ */
+ private String someMonthsType;
+
+}
diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/PartyRankResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/PartyRankResultDTO.java
new file mode 100644
index 0000000..8145d96
--- /dev/null
+++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/PartyRankResultDTO.java
@@ -0,0 +1,31 @@
+package com.elink.esua.epdc.dto.user.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author: qushutong
+ * @Date: 2020/4/14 14:09
+ * @Description:
+ */
+@Data
+public class PartyRankResultDTO implements Serializable {
+ private static final long serialVersionUID = -2283026144967661993L;
+
+ /**
+ * registeredMemberCount : 100
+ * unRegisteredMemberCount : 100
+ * male : 100
+ * female : 100
+ * unknowGender : 100
+ * deptName : 水清沟街道
+ */
+ private int registeredMemberCount;
+ private int unRegisteredMemberCount;
+ private int male;
+ private int female;
+ private int unknowGender;
+ private String deptName;
+
+}
diff --git a/pom.xml b/pom.xml
index 7684d13..403e398 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
榆山党建e家client模块
- epdc-analysis-client
+
epdc-cloud-analysis-client
epdc-cloud-custom-client
epdc-cloud-admin-client