大屏数据采集 - v2升级新增字段

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;

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
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -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}
             )
         </foreach>
     </insert>

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
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -80,7 +86,13 @@
             'APP_USER',
             now(),
             'APP_USER',
-            now()
+            now(),
+            #{item.transferRightRatioFz},
+            #{item.transferRightRatioFm},
+            #{item.satisfactionRatioFz},
+            #{item.satisfactionRatioFm},
+            #{item.issueToProjectRatioFz},
+            #{item.issueToProjectRatioFm}
             )
         </foreach>
     </insert>

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
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -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}
             )
         </foreach>
     </insert>

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
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -95,7 +97,9 @@
             'APP_USER',
             now(),
             'APP_USER',
-            now()
+            now(),
+            #{item.shiftedProjectTotal},
+            #{item.issueTotal}
             )
         </foreach>
     </insert>

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
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -65,7 +69,11 @@
             'APP_USER',
             now(),
             'APP_USER',
-            now()
+            now(),
+            #{item.partyVolunteerTotal},
+            #{item.volunteerTotal},
+            #{item.volunteerUserTotal},
+            #{item.regUserTotal}
             )
         </foreach>
     </insert>

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
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -44,7 +45,8 @@
             now(),
             'APP_USER',
             now(),
-            #{item.dataEndTime}
+            #{item.dataEndTime},
+            #{item.areaCode}
             )
         </foreach>
     </insert>

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
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -46,7 +47,8 @@
             'APP_USER',
             now(),
             #{item.dataEndTime},
-            #{item.allParentIds}
+            #{item.allParentIds},
+            #{item.areaCode}
             )
         </foreach>
     </insert>