From be1ceac10fb775c0acd719be388b212773d73290 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 7 Jan 2021 14:16:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=87=E9=9B=86=20-=20v2=E5=8D=87=E7=BA=A7=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/DeptGovrnAbilityFormDTO.java | 48 +++++++++++++++ .../form/GridGovrnAbilityFormDTO.java | 36 +++++++++++ .../form/GridPartyAbilityFormDTO.java | 12 ++++ .../form/GridServiceAbilityFormDTO.java | 23 +++++++ .../form/OrgGovrnAbilityFormDTO.java | 60 +++++++++++++++++++ .../screencoll/form/CustomerDeptFormDTO.java | 6 ++ .../screencoll/form/CustomerGridFormDTO.java | 6 ++ .../V0.0.5__screen_org_add_source_col.sql | 39 ++++++++++++ .../FactIndexGovrnAblityDeptMonthlyDao.xml | 20 ++++++- .../FactIndexGovrnAblityGridMonthlyDao.xml | 16 ++++- .../FactIndexGovrnAblityOrgMonthlyDao.xml | 24 +++++++- .../FactIndexPartyAblityGridMonthlyDao.xml | 8 ++- .../FactIndexServiceAblityGridMonthlyDao.xml | 12 +++- .../screen/ScreenCustomerDeptDao.xml | 6 +- .../screen/ScreenCustomerGridDao.xml | 6 +- 15 files changed, 308 insertions(+), 14 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.5__screen_org_add_source_col.sql diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/DeptGovrnAbilityFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/DeptGovrnAbilityFormDTO.java index b35ca1537a..fac962754f 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/DeptGovrnAbilityFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/DeptGovrnAbilityFormDTO.java @@ -69,4 +69,52 @@ public class DeptGovrnAbilityFormDTO implements Serializable { * 办结项目满意度 */ private BigDecimal satisfactionRatio; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal respProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal respProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal handleProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal handleProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal closedProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal closedProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFm; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridGovrnAbilityFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridGovrnAbilityFormDTO.java index 021533fe59..1d2f1e7202 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridGovrnAbilityFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridGovrnAbilityFormDTO.java @@ -79,4 +79,40 @@ public class GridGovrnAbilityFormDTO implements Serializable { * 网格自治项目数 统计期网格自身内办结的项目数目 */ private Integer selfSolveProjectCount; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal transferRightRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal transferRightRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal issueToProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal issueToProjectRatioFm; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyAbilityFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyAbilityFormDTO.java index 3aa816cafd..c7acdf1827 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyAbilityFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyAbilityFormDTO.java @@ -104,4 +104,16 @@ public class GridPartyAbilityFormDTO implements Serializable { * 党员参加三会一课人次 */ private Integer joinThreeMeetsCount; + + /** + * V2升级字段：issueToProjectRatio的分子：评价周期内转为项目的数量 + * 2020-01-07 新增 + */ + private Integer shiftedProjectTotal; + + /** + * V2升级字段：issueToProjectRatio的分母：评价周期内网格内居民提出的议题数目 + * 2020-01-07 新增 + */ + private Integer issueTotal; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridServiceAbilityFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridServiceAbilityFormDTO.java index 02b7906a36..fe34aaa150 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridServiceAbilityFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridServiceAbilityFormDTO.java @@ -55,4 +55,27 @@ public class GridServiceAbilityFormDTO implements Serializable { */ private BigDecimal partyVolunteerRatio; + /** + * V2升级字段：partyVolunteerRatio的分子：网格党员志愿者数 + * 2020-01-07 + */ + private Integer partyVolunteerTotal; + + /** + * V2升级字段：partyVolunteerRatio的分母：志愿者总数 + * 2020-01-07 + */ + private Integer volunteerTotal; + + /** + * V2升级字段：volunteerRatio的分子：居民且注册志愿者的总人数 + * 2020-01-07 + */ + private Integer volunteerUserTotal; + + /** + * V2升级字段：volunteerRatio的分母：网格内注册居民数 + * 2020-01-07 + */ + private Integer regUserTotal; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityFormDTO.java index dc91df6e08..afcb201303 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgGovrnAbilityFormDTO.java @@ -80,4 +80,64 @@ public class OrgGovrnAbilityFormDTO implements Serializable { * 街道办结项目的处理效率, data_type=street时有值 */ private BigDecimal handleProjectRatio; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal respProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal respProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal closedProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal closedProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal overdueProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal overdueProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal handleProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal handleProjectRatioFm; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java index a99713701a..e39b6e1644 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java @@ -48,4 +48,10 @@ public class CustomerDeptFormDTO implements Serializable { * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) */ private String dataEndTime; + + /** + * V2升级必传参数：当前网格所属行政地区编码，去除末尾0 + * 2020-01-07 + */ + private String areaCode; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java index 75eb13a0fa..ad9277c0d8 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java @@ -53,4 +53,10 @@ public class CustomerGridFormDTO implements Serializable { * 所有上级ID，用英文逗号分开(8.26新增) */ private String allParentIds; + + /** + * V2升级必传参数：当前网格所属行政地区编码，去除末尾0 + * 2020-01-07 + */ + private String areaCode; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.5__screen_org_add_source_col.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.5__screen_org_add_source_col.sql new file mode 100644 index 0000000000..6f79e281f0 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.5__screen_org_add_source_col.sql @@ -0,0 +1,39 @@ +# alter table screen_customer_agency add column SHIFTED_PROJECT_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：issueToProjectRatio的分子：评价周期内转为项目的数量', +# alter table screen_customer_agency add column ISSUE_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：issueToProjectRatio的分母：评价周期内网格内居民提出的议题数目', + +# alter table fact_index_service_ablity_grid_monthly add column PARTY_VOLUNTEER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：partyVolunteerRatio的分子：网格党员志愿者数', +# alter table fact_index_service_ablity_grid_monthly add column VOLUNTEER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：partyVolunteerRatio的分母：志愿者总数', +# alter table fact_index_service_ablity_grid_monthly add column VOLUNTEER_USER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：volunteerRatio的分子：居民且注册志愿者的总人数', +# alter table fact_index_service_ablity_grid_monthly add column REG_USER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：volunteerRatio的分母：网格内注册居民数', + +# alter table fact_index_govrn_ablity_grid_monthly add column TRANSFER_RIGHT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_grid_monthly add column TRANSFER_RIGHT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_grid_monthly add column SATISFACTION_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_grid_monthly add column SATISFACTION_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_grid_monthly add column ISSUE_TO_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_grid_monthly add column ISSUE_TO_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', + +# alter table fact_index_govrn_ablity_dept_monthly add column RESP_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_dept_monthly add column RESP_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_dept_monthly add column HANDLE_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_dept_monthly add column HANDLE_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_dept_monthly add column CLOSED_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_dept_monthly add column CLOSED_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_dept_monthly add column SATISFACTION_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_dept_monthly add column SATISFACTION_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', + +# alter table fact_index_govrn_ablity_org_monthly add column RESP_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_org_monthly add column RESP_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_org_monthly add column CLOSED_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_org_monthly add column CLOSED_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_org_monthly add column SATISFACTION_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_org_monthly add column SATISFACTION_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_org_monthly add column OVERDUE_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_org_monthly add column OVERDUE_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_org_monthly add column HANDLE_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_org_monthly add column HANDLE_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', + +# alter table screen_customer_grid add column AREA_CODE varchar(30) DEFAULT NULL COMMENT 'V2升级必传参数：当前网格所属行政地区编码，去除末尾0', +# alter table screen_customer_dept add column AREA_CODE varchar(30) DEFAULT NULL COMMENT 'V2升级必传参数：当前网格所属行政地区编码，去除末尾0', + +select 1; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityDeptMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityDeptMonthlyDao.xml index b4475c72cd..404cc2f7f8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityDeptMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityDeptMonthlyDao.xml @@ -52,7 +52,15 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + RESP_PROJECT_RATIO_FZ, + RESP_PROJECT_RATIO_FM, + HANDLE_PROJECT_RATIO_FZ, + HANDLE_PROJECT_RATIO_FM, + CLOSED_PROJECT_RATIO_FZ, + CLOSED_PROJECT_RATIO_FM, + SATISFACTION_RATIO_FZ, + SATISFACTION_RATIO_FM ) values ( @@ -74,7 +82,15 @@ 'APP_USER', now(), 'APP_USER', - now() + now(), + #{item.respProjectRatioFz}, + #{item.respProjectRatioFm}, + #{item.handleProjectRatioFz}, + #{item.handleProjectRatioFm}, + #{item.closedProjectRatioFz}, + #{item.closedProjectRatioFm}, + #{item.satisfactionRatioFz}, + #{item.satisfactionRatioFm} ) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml index e30d52c675..1a8d1d7aa1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml @@ -56,7 +56,13 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + TRANSFER_RIGHT_RATIO_FZ, + TRANSFER_RIGHT_RATIO_FM, + SATISFACTION_RATIO_FZ, + SATISFACTION_RATIO_FM, + ISSUE_TO_PROJECT_RATIO_FZ, + ISSUE_TO_PROJECT_RATIO_FM ) values ( @@ -80,7 +86,13 @@ 'APP_USER', now(), 'APP_USER', - now() + now(), + #{item.transferRightRatioFz}, + #{item.transferRightRatioFm}, + #{item.satisfactionRatioFz}, + #{item.satisfactionRatioFm}, + #{item.issueToProjectRatioFz}, + #{item.issueToProjectRatioFm} ) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml index 3a4250d1ad..065ac740a3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml @@ -63,7 +63,17 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + RESP_PROJECT_RATIO_FZ, + RESP_PROJECT_RATIO_FM, + CLOSED_PROJECT_RATIO_FZ, + CLOSED_PROJECT_RATIO_FM, + SATISFACTION_RATIO_FZ, + SATISFACTION_RATIO_FM, + OVERDUE_PROJECT_RATIO_FZ, + OVERDUE_PROJECT_RATIO_FM, + HANDLE_PROJECT_RATIO_FZ, + HANDLE_PROJECT_RATIO_FM ) values ( @@ -87,7 +97,17 @@ 'APP_USER', now(), 'APP_USER', - now() + now(), + #{item.respProjectRatioFz}, + #{item.respProjectRatioFm}, + #{item.closedProjectRatioFz}, + #{item.closedProjectRatioFm}, + #{item.satisfactionRatioFz}, + #{item.satisfactionRatioFm}, + #{item.overdueProjectRatioFz}, + #{item.overdueProjectRatioFm}, + #{item.handleProjectRatioFz}, + #{item.handleProjectRatioFm} ) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyDao.xml index 9208f9a533..2ea92ebb5d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyDao.xml @@ -66,7 +66,9 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + SHIFTED_PROJECT_TOTAL, + ISSUE_TOTAL ) values ( @@ -95,7 +97,9 @@ 'APP_USER', now(), 'APP_USER', - now() + now(), + #{item.shiftedProjectTotal}, + #{item.issueTotal} ) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyDao.xml index 2a4d8a7039..be06e22b1a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyDao.xml @@ -46,7 +46,11 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + PARTY_VOLUNTEER_TOTAL, + VOLUNTEER_TOTAL, + VOLUNTEER_USER_TOTAL, + REG_USER_TOTAL ) values ( @@ -65,7 +69,11 @@ 'APP_USER', now(), 'APP_USER', - now() + now(), + #{item.partyVolunteerTotal}, + #{item.volunteerTotal}, + #{item.volunteerUserTotal}, + #{item.regUserTotal} ) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerDeptDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerDeptDao.xml index 26c34d328b..7dd6ba62a4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerDeptDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerDeptDao.xml @@ -26,7 +26,8 @@ CREATED_TIME, UPDATED_BY, UPDATED_TIME, - DATA_END_TIME + DATA_END_TIME, + AREA_CODE ) values ( @@ -44,7 +45,8 @@ now(), 'APP_USER', now(), - #{item.dataEndTime} + #{item.dataEndTime}, + #{item.areaCode} ) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml index 9df4f5941f..147941c2d1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml @@ -27,7 +27,8 @@ UPDATED_BY, UPDATED_TIME, DATA_END_TIME, - ALL_PARENT_IDS + ALL_PARENT_IDS, + AREA_CODE ) values ( @@ -46,7 +47,8 @@ 'APP_USER', now(), #{item.dataEndTime}, - #{item.allParentIds} + #{item.allParentIds}, + #{item.areaCode} ) From 3918015975f4fd5635b91786cd18e71c1adbe449 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 7 Jan 2021 15:34:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=87=E9=9B=86=20-=20v2=E5=8D=87=E7=BA=A7=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20-=20entity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...FactIndexGovrnAblityDeptMonthlyEntity.java | 49 +++++++++++++- ...FactIndexGovrnAblityGridMonthlyEntity.java | 37 ++++++++++- .../FactIndexGovrnAblityOrgMonthlyEntity.java | 60 +++++++++++++++++ ...FactIndexPartyAblityGridMonthlyEntity.java | 14 +++- ...ctIndexServiceAblityGridMonthlyEntity.java | 23 +++++++ .../screen/ScreenCustomerDeptEntity.java | 5 ++ .../screen/ScreenCustomerGridEntity.java | 6 ++ .../V0.0.5__screen_org_add_source_col.sql | 66 +++++++++---------- 8 files changed, 223 insertions(+), 37 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityDeptMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityDeptMonthlyEntity.java index 47501f13f4..e1d90758ee 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityDeptMonthlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityDeptMonthlyEntity.java @@ -25,7 +25,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; /** - * 治理能力-部门相关数据 + * 治理能力-部门相关数据 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-08-20 @@ -97,4 +97,51 @@ public class FactIndexGovrnAblityDeptMonthlyEntity extends BaseEpmetEntity { */ private BigDecimal satisfactionRatio; + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal respProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal respProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal handleProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal handleProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal closedProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal closedProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFm; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyEntity.java index 7b0c61a9fd..e8e9177ed1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyEntity.java @@ -25,7 +25,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; /** - * 治理能力-网格相关事实表 + * 治理能力-网格相关事实表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-08-20 @@ -107,4 +107,39 @@ public class FactIndexGovrnAblityGridMonthlyEntity extends BaseEpmetEntity { */ private BigDecimal satisfactionRatio; + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal transferRightRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal transferRightRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal issueToProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal issueToProjectRatioFm; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java index fe8ee990b8..90a8245ab5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java @@ -106,4 +106,64 @@ public class FactIndexGovrnAblityOrgMonthlyEntity extends BaseEpmetEntity { * 街道办结项目的处理效率, data_type=street时有值 */ private BigDecimal handleProjectRatio; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal respProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal respProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal closedProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal closedProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal satisfactionRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal overdueProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal overdueProjectRatioFm; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal handleProjectRatioFz; + + /** + * V2升级新增字段, 详见说明文档 + * 2020-01-07 + */ + private BigDecimal handleProjectRatioFm; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyEntity.java index b38d4c4d7a..c19656db68 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyEntity.java @@ -25,7 +25,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; /** - * 党建能力-网格相关事实表 + * 党建能力-网格相关事实表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-08-20 @@ -132,4 +132,16 @@ public class FactIndexPartyAblityGridMonthlyEntity extends BaseEpmetEntity { */ private Integer joinThreeMeetsCount; + + /** + * V2升级字段：issueToProjectRatio的分子：评价周期内转为项目的数量 + * 2020-01-07 新增 + */ + private Integer shiftedProjectTotal; + + /** + * V2升级字段：issueToProjectRatio的分母：评价周期内网格内居民提出的议题数目 + * 2020-01-07 新增 + */ + private Integer issueTotal; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyEntity.java index fedcaf1637..c296fb4a42 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyEntity.java @@ -82,4 +82,27 @@ public class FactIndexServiceAblityGridMonthlyEntity extends BaseEpmetEntity { */ private BigDecimal partyVolunteerRatio; + /** + * V2升级字段：partyVolunteerRatio的分子：网格党员志愿者数 + * 2020-01-07 + */ + private Integer partyVolunteerTotal; + + /** + * V2升级字段：partyVolunteerRatio的分母：志愿者总数 + * 2020-01-07 + */ + private Integer volunteerTotal; + + /** + * V2升级字段：volunteerRatio的分子：居民且注册志愿者的总人数 + * 2020-01-07 + */ + private Integer volunteerUserTotal; + + /** + * V2升级字段：volunteerRatio的分母：网格内注册居民数 + * 2020-01-07 + */ + private Integer regUserTotal; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerDeptEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerDeptEntity.java index 474243815a..6c67961fde 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerDeptEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerDeptEntity.java @@ -77,4 +77,9 @@ public class ScreenCustomerDeptEntity extends BaseEpmetEntity { private String sourceType; + /** + * V2升级必传参数：当前网格所属行政地区编码，去除末尾0 + * 2020-01-07 + */ + private String areaCode; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java index 0b98a125eb..1da1c7a11d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java @@ -81,4 +81,10 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity { private String allParentIds; private String sourceType; + + /** + * V2升级必传参数：当前网格所属行政地区编码，去除末尾0 + * 2020-01-07 + */ + private String areaCode; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.5__screen_org_add_source_col.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.5__screen_org_add_source_col.sql index 6f79e281f0..fd07a896c0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.5__screen_org_add_source_col.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.5__screen_org_add_source_col.sql @@ -1,39 +1,37 @@ -# alter table screen_customer_agency add column SHIFTED_PROJECT_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：issueToProjectRatio的分子：评价周期内转为项目的数量', -# alter table screen_customer_agency add column ISSUE_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：issueToProjectRatio的分母：评价周期内网格内居民提出的议题数目', +# alter table fact_index_party_ablity_grid_monthly add column SHIFTED_PROJECT_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：issueToProjectRatio的分子：评价周期内转为项目的数量'; +# alter table fact_index_party_ablity_grid_monthly add column ISSUE_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：issueToProjectRatio的分母：评价周期内网格内居民提出的议题数目'; -# alter table fact_index_service_ablity_grid_monthly add column PARTY_VOLUNTEER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：partyVolunteerRatio的分子：网格党员志愿者数', -# alter table fact_index_service_ablity_grid_monthly add column VOLUNTEER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：partyVolunteerRatio的分母：志愿者总数', -# alter table fact_index_service_ablity_grid_monthly add column VOLUNTEER_USER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：volunteerRatio的分子：居民且注册志愿者的总人数', -# alter table fact_index_service_ablity_grid_monthly add column REG_USER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：volunteerRatio的分母：网格内注册居民数', +# alter table fact_index_service_ablity_grid_monthly add column PARTY_VOLUNTEER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：partyVolunteerRatio的分子：网格党员志愿者数'; +# alter table fact_index_service_ablity_grid_monthly add column VOLUNTEER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：partyVolunteerRatio的分母：志愿者总数'; +# alter table fact_index_service_ablity_grid_monthly add column VOLUNTEER_USER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：volunteerRatio的分子：居民且注册志愿者的总人数'; +# alter table fact_index_service_ablity_grid_monthly add column REG_USER_TOTAL int(11) DEFAULT NULL COMMENT 'V2升级字段：volunteerRatio的分母：网格内注册居民数'; -# alter table fact_index_govrn_ablity_grid_monthly add column TRANSFER_RIGHT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_grid_monthly add column TRANSFER_RIGHT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_grid_monthly add column SATISFACTION_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_grid_monthly add column SATISFACTION_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_grid_monthly add column ISSUE_TO_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_grid_monthly add column ISSUE_TO_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_grid_monthly add column TRANSFER_RIGHT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_grid_monthly add column TRANSFER_RIGHT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_grid_monthly add column SATISFACTION_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_grid_monthly add column SATISFACTION_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_grid_monthly add column ISSUE_TO_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_grid_monthly add column ISSUE_TO_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; -# alter table fact_index_govrn_ablity_dept_monthly add column RESP_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_dept_monthly add column RESP_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_dept_monthly add column HANDLE_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_dept_monthly add column HANDLE_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_dept_monthly add column CLOSED_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_dept_monthly add column CLOSED_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_dept_monthly add column SATISFACTION_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_dept_monthly add column SATISFACTION_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_dept_monthly add column RESP_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_dept_monthly add column RESP_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_dept_monthly add column HANDLE_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_dept_monthly add column HANDLE_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_dept_monthly add column CLOSED_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_dept_monthly add column CLOSED_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_dept_monthly add column SATISFACTION_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_dept_monthly add column SATISFACTION_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; -# alter table fact_index_govrn_ablity_org_monthly add column RESP_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_org_monthly add column RESP_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_org_monthly add column CLOSED_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_org_monthly add column CLOSED_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_org_monthly add column SATISFACTION_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_org_monthly add column SATISFACTION_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_org_monthly add column OVERDUE_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_org_monthly add column OVERDUE_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_org_monthly add column HANDLE_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', -# alter table fact_index_govrn_ablity_org_monthly add column HANDLE_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档', +# alter table fact_index_govrn_ablity_org_monthly add column RESP_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_org_monthly add column RESP_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_org_monthly add column CLOSED_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_org_monthly add column CLOSED_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_org_monthly add column SATISFACTION_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_org_monthly add column SATISFACTION_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_org_monthly add column OVERDUE_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_org_monthly add column OVERDUE_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_org_monthly add column HANDLE_PROJECT_RATIO_FZ decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; +# alter table fact_index_govrn_ablity_org_monthly add column HANDLE_PROJECT_RATIO_FM decimal(10,6) DEFAULT NULL COMMENT 'V2升级新增字段, 详见说明文档'; -# alter table screen_customer_grid add column AREA_CODE varchar(30) DEFAULT NULL COMMENT 'V2升级必传参数：当前网格所属行政地区编码，去除末尾0', -# alter table screen_customer_dept add column AREA_CODE varchar(30) DEFAULT NULL COMMENT 'V2升级必传参数：当前网格所属行政地区编码，去除末尾0', - -select 1; +# alter table screen_customer_grid add column AREA_CODE varchar(30) DEFAULT NULL COMMENT 'V2升级必传参数：当前网格所属行政地区编码，去除末尾0'; +# alter table screen_customer_dept add column AREA_CODE varchar(30) DEFAULT NULL COMMENT 'V2升级必传参数：当前网格所属行政地区编码，去除末尾0'; From 5c5d610f38e888d803abbadfbb3fc36bbf6d4be5 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 14 Jan 2021 13:38:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?dimCustomer=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0areaCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/result/CustomerAreaCodeResultDTO.java | 25 +++++++++++++++++++ .../epmet/dao/org/StatsCustomerAgencyDao.java | 9 +++++++ .../com/epmet/entity/crm/CustomerEntity.java | 3 +++ .../epmet/entity/stats/DimCustomerEntity.java | 2 ++ .../service/impl/StatsDimServiceImpl.java | 17 +++++++++++++ .../service/org/CustomerAgencyService.java | 9 +++++++ .../org/impl/CustomerAgencyServiceImpl.java | 18 +++++++++++++ .../stats/impl/DimCustomerServiceImpl.java | 2 ++ .../mapper/org/StatsCustomerAgencyDao.xml | 17 +++++++++++++ .../resources/mapper/stats/DimCustomerDao.xml | 2 ++ 10 files changed, 104 insertions(+) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerAreaCodeResultDTO.java diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerAreaCodeResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerAreaCodeResultDTO.java new file mode 100644 index 0000000000..f3b4a73048 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerAreaCodeResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.org.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/1/14 上午11:05 + */ +@Data +public class CustomerAreaCodeResultDTO implements Serializable { + + private static final long serialVersionUID = -4722604654441455214L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 行政区域编码 + */ + private String areaCode; +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java index eb02051e91..9c1217bd02 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java @@ -2,6 +2,7 @@ package com.epmet.dao.org; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.AgencySubTreeDto; +import com.epmet.dto.org.result.CustomerAreaCodeResultDTO; import com.epmet.entity.org.CustomerAgencyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -22,4 +23,12 @@ public interface StatsCustomerAgencyDao extends BaseDao { List selectSubAgencyByPid(@Param("pid")String pid); List listAgenciesByUpdatedTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime); + + /** + * @Description 查询客户所属区域编码 + * @Param customerIds + * @author zxc + * @date 2021/1/14 上午11:07 + */ + List selectCustomerAreaCodeById(@Param("customerIds") List customerIds); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/crm/CustomerEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/crm/CustomerEntity.java index a2fa408a43..c6dc6dba64 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/crm/CustomerEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/crm/CustomerEntity.java @@ -17,6 +17,7 @@ package com.epmet.entity.crm; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; @@ -88,4 +89,6 @@ public class CustomerEntity extends BaseEpmetEntity { */ private String logo; + @TableField(exist = false) + private String areaCode; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerEntity.java index a287006414..6641ecd2dc 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimCustomerEntity.java @@ -43,4 +43,6 @@ public class DimCustomerEntity extends BaseEpmetEntity { */ private String customerName; + private String areaCode; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java index 5c09458416..6338145260 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.service.impl; import com.epmet.constant.RobotConstant; +import com.epmet.dto.org.result.CustomerAreaCodeResultDTO; import com.epmet.entity.crm.CustomerEntity; import com.epmet.entity.org.CustomerAgencyEntity; import com.epmet.entity.org.CustomerDepartmentEntity; @@ -199,6 +200,14 @@ public class StatsDimServiceImpl implements StatsDimService { List customers = customerService.listValidCustomersByCreateTime(lastInitTime, initTime); + // 添加 areaCode + if (!CollectionUtils.isEmpty(customers)){ + List customerIds = customers.stream().map(m -> m.getId()).collect(Collectors.toList()); + List areaCodes = customerAgencyService.selectCustomerAreaCodeById(customerIds); + if (!CollectionUtils.isEmpty(areaCodes)){ + customers.forEach(c -> areaCodes.stream().filter(a -> c.getId().equals(a.getCustomerId())).forEach(a -> c.setAreaCode(a.getAreaCode()))); + } + } return customers; } @@ -212,6 +221,14 @@ public class StatsDimServiceImpl implements StatsDimService { if (lastCreatedDim != null) { // 说明不是首次初始化 List customers = customerService.listValidCustomersByUpdatedTime(lastCreatedDim.getUpdatedTime(), initTime); + // 添加 areaCode + if (!CollectionUtils.isEmpty(customers)){ + List customerIds = customers.stream().map(m -> m.getId()).collect(Collectors.toList()); + List areaCodes = customerAgencyService.selectCustomerAreaCodeById(customerIds); + if (!CollectionUtils.isEmpty(areaCodes)){ + customers.forEach(c -> areaCodes.stream().filter(a -> c.getId().equals(a.getCustomerId())).forEach(a -> c.setAreaCode(a.getAreaCode()))); + } + } return customers; } return new ArrayList<>(); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java index 96669f2ae9..b93c4563ec 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java @@ -1,5 +1,6 @@ package com.epmet.service.org; +import com.epmet.dto.org.result.CustomerAreaCodeResultDTO; import com.epmet.entity.org.CustomerAgencyEntity; import java.util.Date; @@ -9,4 +10,12 @@ public interface CustomerAgencyService { List listAgenciesByCreateTime(Date statsStartTime, Date statsEndTime); List listAgenciesByUpdatedTime(Date updatedTime, Date now); + + /** + * @Description 查询客户所属区域编码 + * @Param customerIds + * @author zxc + * @date 2021/1/14 上午11:07 + */ + List selectCustomerAreaCodeById(List customerIds); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java index 4813309176..702da0930d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java @@ -3,11 +3,14 @@ package com.epmet.service.org.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.constant.DataSourceConstant; import com.epmet.dao.org.StatsCustomerAgencyDao; +import com.epmet.dto.org.result.CustomerAreaCodeResultDTO; import com.epmet.entity.org.CustomerAgencyEntity; import com.epmet.service.org.CustomerAgencyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -27,4 +30,19 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService { public List listAgenciesByUpdatedTime(Date startTime, Date endTime) { return customerAgencyDao.listAgenciesByUpdatedTime(startTime, endTime); } + + /** + * @Description 查询客户所属区域编码 + * @Param customerIds + * @author zxc + * @date 2021/1/14 上午11:07 + */ + @Override + public List selectCustomerAreaCodeById(List customerIds) { + if (!CollectionUtils.isEmpty(customerIds)){ + List resultDTOS = customerAgencyDao.selectCustomerAreaCodeById(customerIds); + return resultDTOS; + } + return new ArrayList<>(); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java index 367b06629b..feae456fb3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java @@ -128,6 +128,7 @@ public class DimCustomerServiceImpl extends BaseServiceImpl #{endTime} + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerDao.xml index 54914e24d0..457801d6b5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerDao.xml @@ -15,6 +15,7 @@