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

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

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

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

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

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

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

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

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