From 0d7d292f6603f03a0c0ed81d26d14c7ee9176164 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Aug 2020 11:39:02 +0800 Subject: [PATCH] =?UTF-8?q?screen=5F=E7=9B=B8=E5=85=B3=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/screen/ScreenCustomerGridDao.java | 2 +- .../dao/screen/ScreenDifficultyDataDao.java | 2 +- .../dao/screen/ScreenUserTotalDataDao.java | 2 +- .../dao/screen/ScreenCustomerGridDao.java | 2 +- .../dao/screen/ScreenDifficultyDataDao.java | 2 +- .../dao/screen/ScreenUserTotalDataDao.java | 2 +- .../screen/ScreenCpcBaseDataEntity.java | 19 ++++-- .../screen/ScreenCustomerAgencyEntity.java | 10 ++- .../screen/ScreenCustomerDeptEntity.java | 7 +- .../screen/ScreenCustomerGridEntity.java | 9 ++- .../screen/ScreenDifficultyDataEntity.java | 16 +++-- .../entity/screen/ScreenEventDataEntity.java | 26 ++++--- .../screen/ScreenEventImgDataEntity.java | 2 +- .../screen/ScreenGovernRankDataEntity.java | 4 +- .../screen/ScreenIndexDataMonthlyEntity.java | 8 +-- .../screen/ScreenIndexDataYearlyEntity.java | 2 +- .../screen/ScreenOrgRankDataEntity.java | 4 +- .../screen/ScreenPartyBranchDataEntity.java | 15 ++--- .../ScreenPartyLinkMassesDataEntity.java | 9 ++- .../screen/ScreenPartyUserRankDataEntity.java | 41 +++++++----- .../screen/ScreenPioneerDataEntity.java | 43 ++++++++++-- .../entity/screen/ScreenUserJoinEntity.java | 67 +++++++++++++------ .../screen/ScreenUserTotalDataEntity.java | 23 +++++-- 23 files changed, 216 insertions(+), 101 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java index 9dff41e9ff..4e57c2f71d 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCustomerGridDao.java @@ -27,7 +27,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 网格信息 + * 网格(党支部)信息 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-08-18 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenDifficultyDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenDifficultyDataDao.java index ced4f66003..5a18c2b998 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenDifficultyDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenDifficultyDataDao.java @@ -20,7 +20,7 @@ package com.epmet.datareport.dao.screen; import org.apache.ibatis.annotations.Mapper; /** - * 基层治理-难点堵点 + * 基层治理-难点堵点(耗时最长|设计部门最多|处理次数) * * @author generator generator@elink-cn.com * @since v1.0.0 2020-08-18 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java index 46576c5517..14137c4be0 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java @@ -23,7 +23,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** - * 中央区-各类用户总数 + * 中央区-各类(用户|党员|党群|话题|议题|项目|注册人数|参与人数)总数 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-08-18 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java index 3925d0ad6e..c9fa856582 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java @@ -26,7 +26,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 网格信息 + * 网格(党支部)信息 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-08-18 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java index 5379eeb893..1a9b991bac 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java @@ -26,7 +26,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 基层治理-难点堵点 + * 基层治理-难点堵点(耗时最长|设计部门最多|处理次数) * * @author generator generator@elink-cn.com * @since v1.0.0 2020-08-18 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java index ec449f1352..e0712dee50 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java @@ -26,7 +26,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 中央区-各类用户总数 + * 中央区-各类(用户|党员|党群|话题|议题|项目|注册人数|参与人数)总数 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-08-18 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCpcBaseDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCpcBaseDataEntity.java index 18eaf5d6e3..e649e5e89f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCpcBaseDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCpcBaseDataEntity.java @@ -29,7 +29,7 @@ import java.util.Date; * 基层党建-党员基本情况 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -63,6 +63,11 @@ public class ScreenCpcBaseDataEntity extends BaseEpmetEntity { */ private String orgName; + /** + * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) + */ + private String dataEndTime; + /** * 注册用户数 */ @@ -79,32 +84,32 @@ public class ScreenCpcBaseDataEntity extends BaseEpmetEntity { private Integer partyMemberCount; /** - * 小于20岁 + * 小于20岁的党员总人数 */ private Integer ageLevel1; /** - * 20-30岁 + * 20-30岁的党员总人数 */ private Integer ageLevel2; /** - * 31-40岁 + * 31-40岁的党员总人数 */ private Integer ageLevel3; /** - * 41-50岁 + * 41-50岁的党员总人数 */ private Integer ageLevel4; /** - * 51-60岁 + * 51-60岁的党员总人数 */ private Integer ageLevel5; /** - * 60+岁 + * 60+岁的党员总人数 */ private Integer ageLevel6; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerAgencyEntity.java index 91f37c37c1..96b2e23dfe 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerAgencyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerAgencyEntity.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package com.epmet.entity.screen; import com.baomidou.mybatisplus.annotation.TableName; @@ -29,7 +28,7 @@ import java.util.Date; * 组织机构信息 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -59,7 +58,7 @@ public class ScreenCustomerAgencyEntity extends BaseEpmetEntity { private String pid; /** - * 所有上级ID，用逗号分开 + * 所有上级ID，用逗号（英文）分开 */ private String pids; @@ -97,4 +96,9 @@ public class ScreenCustomerAgencyEntity extends BaseEpmetEntity { */ private String areaCode; + /** + * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) + */ + private String dataEndTime; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerDeptEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerDeptEntity.java index 2dc5f09cc4..f020e44cd8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerDeptEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerDeptEntity.java @@ -29,7 +29,7 @@ import java.util.Date; * 部门信息 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -73,4 +73,9 @@ public class ScreenCustomerDeptEntity extends BaseEpmetEntity { */ private String deptMark; + /** + * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) + */ + private String dataEndTime; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerGridEntity.java index 646fd8af24..99b6c99553 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerGridEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerGridEntity.java @@ -26,10 +26,10 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * 网格信息 + * 网格(党支部)信息 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -73,4 +73,9 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity { */ private String partyMark; + /** + * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) + */ + private String dataEndTime; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java index 3a49498dca..27426e658c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java @@ -26,10 +26,10 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * 基层治理-难点堵点 + * 基层治理-难点堵点(耗时最长|设计部门最多|处理次数) * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -113,8 +113,14 @@ public class ScreenDifficultyDataEntity extends BaseEpmetEntity { */ private String eventStatusDesc; - /** - * 最近一次操作说明 - */ + /** + * 最近一次操作说明 + */ private String latestOperateDesc; + + /** + * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) + */ + private String dataEndTime; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java index a007794682..e666f852b0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java @@ -30,7 +30,7 @@ import java.util.Date; * 中央区-事件数据 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -124,18 +124,24 @@ public class ScreenEventDataEntity extends BaseEpmetEntity { */ private Date lastProcessDate; - /** - * 事件状态key - */ + /** + * 事件状态key + */ private String eventStatusCode; - /** - * 事件状态描述 - */ + /** + * 事件状态描述 + */ private String eventStatusDesc; - /** - * 最近一次操作说明 - */ + /** + * 最近一次操作说明 + */ private String latestOperateDesc; + + /** + * 数据更新至: yyyy|yyyMM|yyyyMMdd + */ + private String dataEndTime; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventImgDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventImgDataEntity.java index 9babf7e18f..fb0e81290b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventImgDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventImgDataEntity.java @@ -29,7 +29,7 @@ import java.util.Date; * 中央区-事件数据图片数据 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenGovernRankDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenGovernRankDataEntity.java index 804ad16f07..d280785a6c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenGovernRankDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenGovernRankDataEntity.java @@ -27,10 +27,10 @@ import java.math.BigDecimal; import java.util.Date; /** - * 基层治理-治理能力排行数据 + * 基层治理-治理能力排行数据(按月统计) * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataMonthlyEntity.java index f0f3ef1fed..fbeb83ba9a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataMonthlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataMonthlyEntity.java @@ -27,10 +27,10 @@ import java.math.BigDecimal; import java.util.Date; /** - * 指数-指数数据 + * 指数-指数数据(每月数值) * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -45,12 +45,12 @@ public class ScreenIndexDataMonthlyEntity extends BaseEpmetEntity { private String customerId; /** - * 年Id + * 年Id: yyyy */ private String yearId; /** - * 月份Id + * 月份Id yyyyMM */ private String monthId; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataYearlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataYearlyEntity.java index 8f8063c0db..259947010d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataYearlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenIndexDataYearlyEntity.java @@ -30,7 +30,7 @@ import java.util.Date; * 指数-指数数据(按年统计) * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-19 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenOrgRankDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenOrgRankDataEntity.java index e5a33a235e..a732eda4b9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenOrgRankDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenOrgRankDataEntity.java @@ -27,10 +27,10 @@ import java.math.BigDecimal; import java.util.Date; /** - * 党建引领-组织排行榜 + * 党建引领-组织先进排行榜 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java index 8717291a31..cb870d2de7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package com.epmet.entity.screen; import com.baomidou.mybatisplus.annotation.TableName; @@ -26,10 +25,10 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * 基层党建-建设情况数据（支部，联建,志愿服务） + * 基层党建-建设情况数据（支部，联建,志愿服务)按月 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -54,7 +53,7 @@ public class ScreenPartyBranchDataEntity extends BaseEpmetEntity { private String monthId; /** - * 数据类别 party:支部建设;union:联合建设党员志愿服务：voluntaryservice + * 数据类别 ：party:支部建设; union:联合建设；党员志愿服务：voluntaryservice */ private String type; @@ -84,7 +83,7 @@ public class ScreenPartyBranchDataEntity extends BaseEpmetEntity { private String meetCategoryId; /** - * 会议分类名称 + * 会议分类名称（三会党课、主题党日.....等等） */ private String meetCategoryName; @@ -98,9 +97,9 @@ public class ScreenPartyBranchDataEntity extends BaseEpmetEntity { */ private Integer joinUserCount; - /** - * 平均参加人数 - */ + /** + * 平均参加人数 + */ private Integer averageJoinUserCount; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyLinkMassesDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyLinkMassesDataEntity.java index 4931575b55..c663fc770b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyLinkMassesDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyLinkMassesDataEntity.java @@ -29,7 +29,7 @@ import java.util.Date; * 党建引领-党员联系群众数据 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -64,7 +64,7 @@ public class ScreenPartyLinkMassesDataEntity extends BaseEpmetEntity { private String orgName; /** - * 建群总数 + * 党员建群总数 */ private Integer createGroupTotal; @@ -73,4 +73,9 @@ public class ScreenPartyLinkMassesDataEntity extends BaseEpmetEntity { */ private Integer groupUserTotal; + /** + * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) + */ + private String dataEndTime; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyUserRankDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyUserRankDataEntity.java index a313b55cc7..702e184439 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyUserRankDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyUserRankDataEntity.java @@ -29,7 +29,7 @@ import java.util.Date; * 党建引领｜基层治理-市民（党员）积分排行榜 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -44,47 +44,47 @@ public class ScreenPartyUserRankDataEntity extends BaseEpmetEntity { private String customerId; /** - * 年Id + * 网格id */ - private String yearId; + private String gridId; /** - * 月份Id + * 组织名称 */ - private String monthId; + private String gridName; /** - * 组织类别 agency：组织；部门：department；网格：grid + * 网格所属的组织id */ - private String orgType; + private String orgId; /** - * 组织Id 可以为网格，机关id + * 网格所属的组织名称 */ - private String orgId; + private String orgName; /** - * 上级组织Id + * 是否是党员标志：1是。0不是党员 */ - private String parentId; + private Integer partyFlag; /** - * 组织名称 + * 用户Id */ - private String orgName; + private String userId; /** - * 用户身份 party:党员;resi：居民 + * 姓 */ - private String userType; + private String surname; /** - * 用户Id + * 名 */ - private String userId; + private String name; /** - * 用户名称 + * 姓名 */ private String userName; @@ -93,4 +93,9 @@ public class ScreenPartyUserRankDataEntity extends BaseEpmetEntity { */ private Integer pointTotal; + /** + * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) + */ + private String dataEndTime; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.java index ab192e7161..b53561b229 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.java @@ -23,13 +23,14 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.Date; /** * 党建引领-先锋模范数据 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -64,28 +65,58 @@ public class ScreenPioneerDataEntity extends BaseEpmetEntity { private String orgName; /** - * 用户总数 + * 党员参与议事 */ - private Integer userTotal; + private Integer issueTotal; /** - * 议事数 + * 党员参与议事占比 */ - private Integer issueTotal; + private BigDecimal issueRatio; /** - * 话题总数 + * 党员发布话题 */ private Integer topicTotal; + /** + * 党员发布话题占比 + */ + private BigDecimal topicRatio; + + /** + * 党员发布议题 + */ + private Integer publishIssueTotal; + + /** + * 党员发布议题占比 + */ + private BigDecimal publishIssueRatio; + /** * 议题转项目数 */ private Integer shiftProjectTotal; + /** + * 议题转项目占比 + */ + private BigDecimal shiftProjectRatio; + /** * 解决项目总数 */ private Integer resolvedProjectTotal; + /** + * 解决项目总数占比 + */ + private BigDecimal resolvedProjectRatio; + + /** + * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) + */ + private String dataEndTime; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java index d7ff0d4860..6c054eba53 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java @@ -30,7 +30,7 @@ import java.util.Date; * 基层治理-公众参与 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -44,16 +44,6 @@ public class ScreenUserJoinEntity extends BaseEpmetEntity { */ private String customerId; - /** - * 年Id - */ - private String yearId; - - /** - * 月份Id - */ - private String monthId; - /** * 组织类别 agency：组织；部门：department；网格：grid */ @@ -75,19 +65,58 @@ public class ScreenUserJoinEntity extends BaseEpmetEntity { private String orgName; /** - * 组织次数 + * 数据更新至 年Id: yyyy + */ + private String yearId; + + /** + * 数据更新至 ：月份Id :yyyyMM */ - private Integer organizeTotal; + private String monthId; + + /** + * 总的参与次数 + */ + private String joinTotal; - /** - * 参与次数 - */ - private Integer joinTotal; + /** + * 总的参与次数较上月增长率(采集的时候后台自己计算) + */ + private String joinTotalUpRate; /** - * 平均参与人数 + * 增长：incr；下降：decr； 相等 ：eq */ - private Integer avgJoinUser; + private String joinTotalUpFlag; + /** + * 人均议题 + */ + private Integer avgIssue; + + /** + * 人均议题较上月增长率(采集的时候后台自己计算) + */ + private BigDecimal avgIssueUpRate; + + /** + * 增长：incr；下降：decr； 相等 ：eq + */ + private String avgIssueUpFlag; + + /** + * 平均参与度 + */ + private Integer avgJoin; + + /** + * 平均参与度较上月增长率(采集的时候后台自己计算) + */ + private BigDecimal agvgJoinUpRate; + + /** + * 增长：incr；下降：decr； 相等 ：eq + */ + private String agvgJoinUpFlag; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserTotalDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserTotalDataEntity.java index 80187ba014..a58f257cc6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserTotalDataEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserTotalDataEntity.java @@ -26,10 +26,10 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * 中央区-各类用户总数 + * 中央区-各类(用户|党员|党群|话题|议题|项目|注册人数|参与人数)总数 * * @author generator generator@elink-cn.com - * @since v1.0.0 2020-08-18 + * @since v1.0.0 2020-08-21 */ @Data @EqualsAndHashCode(callSuper=false) @@ -44,7 +44,7 @@ public class ScreenUserTotalDataEntity extends BaseEpmetEntity { private String customerId; /** - * 组织类别 agency：组织；部门：department；网格：grid + * 组织类别 agency：组织；网格：grid；部门：department； */ private String orgType; @@ -59,10 +59,15 @@ public class ScreenUserTotalDataEntity extends BaseEpmetEntity { private String parentId; /** - * 组织名称 + * 组织名称，也可能是网格名称 */ private String orgName; + /** + * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) + */ + private String dataEndTime; + /** * 用户总数 */ @@ -93,4 +98,14 @@ public class ScreenUserTotalDataEntity extends BaseEpmetEntity { */ private Integer projectTotal; + /** + * 注册人数（08-21新增） + */ + private Integer regUserTotal; + + /** + * 参与人数（08-21新增） + */ + private Integer joinUserTotal; + }