Merge remote-tracking branch 'origin/dev_flyway_scripts' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql

@@ -0,0 +1,13 @@
+ALTER TABLE `fact_origin_project_main_daily`
+    ADD COLUMN `ORIGIN` varchar(32) NULL COMMENT '项目来源 来源：议题issue 组织agency' AFTER `AGENCY_ID`,
+    MODIFY COLUMN `GRID_ID` varchar(32) DEFAULT '' COMMENT '网格ID(立项时的网格Id)' AFTER `TOPIC_ID`,
+    ADD COLUMN `ORIGIN_ID` varchar(64) NULL COMMENT '项目来源ID' AFTER `ORIGIN`;
+
+UPDATE fact_origin_project_main_daily t1
+    INNER JOIN ( SELECT ID, ISSUE_ID FROM fact_origin_project_main_daily ) t2 ON t1.ID = t2.ID
+SET t1.ORIGIN = 'issue',
+    t1.ORIGIN_ID = t2.ISSUE_ID;
+UPDATE fact_origin_project_log_daily t1
+    INNER JOIN ( SELECT ID, AGENCY_ID FROM fact_origin_project_log_daily ) t2 ON t1.ID = t2.ID AND t1.ORG_TYPE IS NULL
+SET t1.ORG_TYPE = 'agency',
+    t1.ORG_ID = t2.AGENCY_ID;

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql

@@ -0,0 +1,24 @@
+drop table if EXISTS customer_org_parameter;
+CREATE TABLE `customer_org_parameter` (
+  `ID` varchar(32) NOT NULL COMMENT '主键ID',
+  `CUSTOMER_ID` varchar(32) NOT NULL COMMENT '客户ID',
+  `PARAMETER_KEY` varchar(32) NOT NULL COMMENT '参数键 eg:area_code_switch',
+  `PARAMETER_NAME` varchar(32) NOT NULL COMMENT '参数名 eg:是否开启区域编码',
+  `PARAMETER_VALUE` varchar(32) NOT NULL COMMENT '参数值 eg:开启：open；关闭：closed ',
+  `DESCRIPTION` varchar(512) NOT NULL COMMENT '参数说明 eg:open:当前客户新增组织需要选择areaCode；closed:  无需选择区域编码',
+  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标志 0：未删除，1：已删除',
+  `REVISION` int(11) NOT NULL DEFAULT '0' 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='客户组织相关参数表';
+
+
+alter table customer_agency MODIFY COLUMN PROVINCE VARCHAR(32) COMMENT '区域编码字典中的【省份】名称';
+alter table customer_agency MODIFY COLUMN CITY VARCHAR(32) COMMENT '区域编码字典中的【城市】名称';
+alter table customer_agency MODIFY COLUMN DISTRICT VARCHAR(64) COMMENT '区域编码字典中的【区县】名称';
+alter table customer_agency add COLUMN STREET varchar(64) comment '区域编码字典中的【街道】名称0409' AFTER DISTRICT;
+alter table customer_agency add COLUMN COMMUNITY varchar(64) comment '区域编码字典中的【社区】名称0409'AFTER STREET;
+alter table customer_department add COLUMN AREA_CODE VARCHAR(64) comment '部门所属的行政地区编码:实际就是所属组织的地区编码' AFTER TOTAL_USER;

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `project`
+ADD COLUMN `BACK_GROUND`  varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目背景' AFTER `TITLE`;
+
+
+ALTER TABLE `project`
+MODIFY COLUMN `ORIGIN`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源：议题issue  项目立项:agency' AFTER `AGENCY_ID`;
+