From 2136bbf986fa6adee4571fe1af6f6c49d49db71a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 20 Jan 2021 13:24:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=8E=A5=E5=8F=A3v2=E6=94=B9?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/result/DeptGovrnAbilityDTO.java | 40 +++++++++++++++ .../screen/result/GridGovrnAbilityDTO.java | 30 +++++++++++ .../screen/result/GridPartyAbilityDTO.java | 10 ++++ .../screen/result/GridServiceAbilityDTO.java | 20 ++++++++ .../dto/screen/result/OrgGovrnAbilityDTO.java | 50 +++++++++++++++++++ .../result/ScreenCustomerAgencyDTO.java | 5 ++ .../screen/result/ScreenCustomerDeptDTO.java | 5 ++ .../screen/result/ScreenCustomerGridDTO.java | 5 ++ 8 files changed, 165 insertions(+) diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DeptGovrnAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DeptGovrnAbilityDTO.java index 66fb22f..a367d05 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DeptGovrnAbilityDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/DeptGovrnAbilityDTO.java @@ -69,4 +69,44 @@ public class DeptGovrnAbilityDTO implements Serializable { * 办结项目满意度 */ private BigDecimal satisfactionRatio; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer respProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer respProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer handleProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer handleProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer closedProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer closedProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer satisfactionRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer satisfactionRatioFm; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGovrnAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGovrnAbilityDTO.java index d11ba57..cf6462d 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGovrnAbilityDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGovrnAbilityDTO.java @@ -79,4 +79,34 @@ public class GridGovrnAbilityDTO implements Serializable { * 网格自治项目数 统计期网格自身内办结的项目数目 */ private Integer selfSolveProjectCount; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer transferRightRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer transferRightRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer satisfactionRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer satisfactionRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer issueToProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer issueToProjectRatioFm; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyAbilityDTO.java index 15bdc88..a032282 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyAbilityDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridPartyAbilityDTO.java @@ -104,4 +104,14 @@ public class GridPartyAbilityDTO implements Serializable { * 党员参加三会一课人次 */ private Integer joinThreeMeetsCount; + + /** + * V2升级字段：issueToProjectRatio的分子：评价周期内转为项目的数量 + */ + private Integer shiftedProjectTotal; + + /** + * V2升级字段：issueToProjectRatio的分母：评价周期内网格内居民提出的议题数目 + */ + private Integer issueTotal; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridServiceAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridServiceAbilityDTO.java index f89c15f..00a8152 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridServiceAbilityDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridServiceAbilityDTO.java @@ -55,4 +55,24 @@ public class GridServiceAbilityDTO implements Serializable { */ private BigDecimal partyVolunteerRatio; + /** + * V2升级字段：partyVolunteerRatio的分子：网格党员志愿者数 + */ + private Integer partyVolunteerTotal; + + /** + * V2升级字段：partyVolunteerRatio的分母：志愿者总数 + */ + private Integer volunteerTotal; + + /** + * V2升级字段：volunteerRatio的分子：居民且注册志愿者的总人数 + */ + private Integer volunteerUserTotal; + + /** + * V2升级字段：volunteerRatio的分母：网格内注册居民数 + */ + private Integer regUserTotal; + } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgGovrnAbilityDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgGovrnAbilityDTO.java index c30746c..26a457b 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgGovrnAbilityDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/OrgGovrnAbilityDTO.java @@ -80,4 +80,54 @@ public class OrgGovrnAbilityDTO implements Serializable { * 街道办结项目的处理效率, data_type=street时有值 */ private BigDecimal handleProjectRatio; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer respProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer respProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer closedProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer closedProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer satisfactionRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer satisfactionRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer overdueProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer overdueProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer handleProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + */ + private Integer handleProjectRatioFm; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerAgencyDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerAgencyDTO.java index c16d56f..96e37db 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerAgencyDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerAgencyDTO.java @@ -68,4 +68,9 @@ public class ScreenCustomerAgencyDTO implements Serializable { * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) */ private String dataEndTime; + + /** + * 是否显示 1显示；0不显示 + */ + private String isDisplay; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerDeptDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerDeptDTO.java index 4148c4f..2b08c87 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerDeptDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerDeptDTO.java @@ -48,4 +48,9 @@ public class ScreenCustomerDeptDTO implements Serializable { * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) */ private String dataEndTime; + + /** + * V2升级必传参数：当前部门所属行政区域编码，去除末尾0 + */ + private String areaCode; } diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerGridDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerGridDTO.java index 0abe97a..f9274b7 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerGridDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCustomerGridDTO.java @@ -53,4 +53,9 @@ public class ScreenCustomerGridDTO implements Serializable { * 所有上级ID，用英文逗号分开(8.26新增) */ private String allParentIds; + + /** + * V2升级必传参数：当前网格所属行政地区编码，去除末尾0 + */ + private String areaCode; }