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 a7de879ca6..89dd93d04e 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,3 +1,5 @@ +-- 一、epmet_evaluation_index执行以下sql, +-- 1、五级指标表,采集增加分子分母列 # alter table fact_index_party_ablity_grid_monthly add column SHIFTED_PROJECT_TOTAL int(11) DEFAULT 0 COMMENT 'V2升级字段:issueToProjectRatio的分子:评价周期内转为项目的数量'; # alter table fact_index_party_ablity_grid_monthly add column ISSUE_TOTAL int(11) DEFAULT 0 COMMENT 'V2升级字段:issueToProjectRatio的分母:评价周期内网格内居民提出的议题数目'; @@ -33,6 +35,6 @@ # alter table fact_index_govrn_ablity_org_monthly add column HANDLE_PROJECT_RATIO_FZ decimal(14,6) DEFAULT 0 COMMENT 'V2升级新增字段, 详见说明文档'; # alter table fact_index_govrn_ablity_org_monthly add column HANDLE_PROJECT_RATIO_FM decimal(14,6) DEFAULT 0 COMMENT 'V2升级新增字段, 详见说明文档'; --- !!!epmet_evaluation_index、epmet_data_statistical_display 都要执行 +-- 2、epmet_evaluation_index、epmet_data_statistical_display 都要执行,网格和部门增加area_code # 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'; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.6__indexcal_addCustomerAreaCodeAndCustomerRelationTb.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.6__indexcal_addCustomerAreaCodeAndCustomerRelationTb.sql index 67e8d2771a..00281958a6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.6__indexcal_addCustomerAreaCodeAndCustomerRelationTb.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.6__indexcal_addCustomerAreaCodeAndCustomerRelationTb.sql @@ -1,6 +1,7 @@ --- epmet_data_statistical 库sql脚本: +-- 一、epmet_data_statistical 库sql脚本: +-- 1、客户维度表新增 area_code列 alter table dim_customer add COLUMN AREA_CODE varchar(12) default '' comment '客户所属行政地区编码,取值来自客户根组织的area_code(01.14 add)'after CUSTOMER_NAME; - +-- 2、新增客户关系表 CREATE TABLE `customer_relation` ( `ID` varchar(64) NOT NULL COMMENT '主键', `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.7__update_agencytb_adduptocal.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.7__update_agencytb_adduptocal.sql index ffbb6886c2..eb7ed9fb05 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.7__update_agencytb_adduptocal.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.7__update_agencytb_adduptocal.sql @@ -1,4 +1,5 @@ --- !!!epmet_evaluation_index、epmet_data_statistical_display 都要执行 +-- 一、epmet_evaluation_index、epmet_data_statistical_display 都要执行 +-- 1、网格、部门、组织新增 一列标识是否参与向上计算 alter table screen_customer_grid add column UP_TO_CAL varchar(10) DEFAULT 'yes' COMMENT '是否参与上级计算yes:参与;no:不参与'; alter table screen_customer_dept add column UP_TO_CAL varchar(10) DEFAULT 'yes' COMMENT '是否参与上级计算yes:参与;no:不参与'; alter table screen_customer_agency add column UP_TO_CAL varchar(10) DEFAULT 'yes' COMMENT '是否参与上级计算yes:参与;no:不参与'; \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_146.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_146.sql index 39c8f253e3..c02c3284eb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_146.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_146.sql @@ -1,4 +1,5 @@ --- !!!epmet_evaluation_index、epmet_data_statistical_display 都要执行 +-- 一、epmet_evaluation_index、epmet_data_statistical_display 都要执行 +-- 1、146体系新增3张表 CREATE TABLE `screen_bid_info` ( `ID` varchar(64) NOT NULL COMMENT '主键', `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.9__add_event_analysis.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.9__add_event_analysis.sql new file mode 100644 index 0000000000..c2d028fd3c --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.9__add_event_analysis.sql @@ -0,0 +1,51 @@ +-- !!!epmet_evaluation_index、epmet_data_statistical_display 都要执行 +-- 1、平阴大屏 事件分析相关新增以下表 +CREATE TABLE `screen_project_grid_daily` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `DATE_ID` varchar(8) NOT NULL COMMENT '日期yyyyMMdd', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格id', + `PID` varchar(64) NOT NULL COMMENT '网格所属的组织id', + `PIDS` varchar(255) NOT NULL COMMENT '网格所有的父级id,以英文:或者英文,隔开', + `PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '截止到当前日期,网格内项目总数', + `RESOLVED_NUM` int(11) NOT NULL DEFAULT '0' COMMENT '截止到当前日期,网格内已解决的项目总数', + `RESOLVED_RATIO` decimal(10,6) NOT NULL DEFAULT '0.000000' COMMENT '解决率=RESOLVED_NUM/PROJECT_TOTAL,存储小数即可,保留小数点后4位', + `EVALUATE_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '对当前网格内项目,参与满意度评价的总次数', + `GOOD_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '对当前网格内项目,满意+非常满意的总次数', + `BAD_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '对当前网格内项目,不满意总次数', + `GOOD_RATIO` decimal(10,6) NOT NULL DEFAULT '0.000000' COMMENT '满意率=good_total/evaluate_total', + `BAD_RATIO` decimal(10,6) NOT NULL DEFAULT '0.000000' COMMENT '不满意率=bad_total/evaluate_total', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', + `REVISION` int(10) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目(事件)分析按网格_按天统计'; + + +CREATE TABLE `screen_project_org_daily` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `DATE_ID` varchar(8) NOT NULL COMMENT '日期yyyyMMdd', + `ORG_ID` varchar(64) NOT NULL COMMENT '网格id', + `ORG_TYPE` varchar(64) NOT NULL COMMENT '社区级:community,乡(镇、街道)级:street,区县级: district,市级: city省级:province', + `PID` varchar(64) NOT NULL COMMENT '当前orgId所属的上级id', + `PIDS` varchar(255) NOT NULL COMMENT 'orgId所有的父级id,以英文:或者英文,隔开', + `PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '截止到当前日期,网格内项目总数', + `RESOLVED_NUM` int(11) NOT NULL DEFAULT '0' COMMENT '截止到当前日期,网格内已解决的项目总数', + `RESOLVED_RATIO` decimal(10,6) NOT NULL COMMENT '解决率=RESOLVED_NUM/PROJECT_TOTAL,存储小数即可,保留小数点后4位', + `EVALUATE_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '对当前组织内项目,参与满意度评价的总次数', + `GOOD_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '对当前组织内项目,满意+非常满意的总次数', + `BAD_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '对当前组织内项目,不满意总次数', + `GOOD_RATIO` decimal(10,6) NOT NULL COMMENT '满意率=good_total/evaluate_total', + `BAD_RATIO` decimal(10,6) NOT NULL COMMENT '不满意率=bad_total/evaluate_total', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', + `REVISION` int(10) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目(事件)分析按组织_按天统计'; \ No newline at end of file