From 765a15d67950ae98b7203f278abd34246e130ed7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 12 Apr 2021 09:44:24 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9db?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.11__alter_project.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql new file mode 100644 index 0000000000..5d5631b3bd --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql @@ -0,0 +1,4 @@ +ALTER TABLE `project` +ADD COLUMN `BACK_GROUND` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目背景' AFTER `TITLE`; + + From 8b54ac2738ec6763feeb8ede1533c06b9a70ecb8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 12 Apr 2021 11:18:04 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9project?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.11__alter_project.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql index 5d5631b3bd..2d700d064e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql @@ -2,3 +2,6 @@ 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`; + From a3d55ef4281217ab116c052f6335f6744fc51ec4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 12 Apr 2021 13:40:23 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E6=96=B0=E5=A2=9Earea=5Fcode=EF=BC=8Cdb=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.4__area_code.sql | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql new file mode 100644 index 0000000000..6ad37df868 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql @@ -0,0 +1,23 @@ +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; \ No newline at end of file From 7ab3abc55506a65bf6cdc625de8f2e231ca3f6ad Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 12 Apr 2021 14:22:52 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=BB=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.11__add_origin.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql new file mode 100644 index 0000000000..e39c443e3f --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql @@ -0,0 +1,3 @@ +ALTER TABLE `fact_origin_project_main_daily` + ADD COLUMN `ORIGIN` varchar(32) NULL COMMENT '项目来源 来源：议题issue 组织agency' AFTER `AGENCY_ID`, + ADD COLUMN `ORIGIN_ID` varchar(64) NULL COMMENT '项目来源ID' AFTER `ORIGIN`; \ No newline at end of file From 46d849f087d3061c4b0a98d701e3b63e2efca10e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 12 Apr 2021 14:51:09 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E6=96=B0=E5=A2=9Earea=5Fcode=EF=BC=8Cdb=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.4__area_code.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql index 6ad37df868..40b002fab6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql @@ -20,4 +20,5 @@ 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; \ No newline at end of file +alter table customer_agency add COLUMN COMMUNITY varchar(64) comment '区域编码字典中的【社区】名称0409'AFTER STREET; +alter table customer_department add COLUMN AREA_CODE VARCHAR(64) comment '部门所属的行政地区编码:实际就是所属组织的地区编码' BEFORE DEL_FLAG; \ No newline at end of file From 407885da5361da9cb00d23eb91158ca7d1fa2313 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 12 Apr 2021 17:36:08 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=BB=E8=A1=A8=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.11__add_origin.sql | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql index e39c443e3f..f84245a0d4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql @@ -1,3 +1,12 @@ ALTER TABLE `fact_origin_project_main_daily` ADD COLUMN `ORIGIN` varchar(32) NULL COMMENT '项目来源 来源：议题issue 组织agency' AFTER `AGENCY_ID`, - ADD COLUMN `ORIGIN_ID` varchar(64) NULL COMMENT '项目来源ID' AFTER `ORIGIN`; \ No newline at end of file + 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; From 7a1c7ad30ae583d4d26f62f10c6d8095bb23c682 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 13 Apr 2021 10:14:29 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=BB=E8=A1=A8=20grid?= =?UTF-8?q?Id=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BAemptySt?= =?UTF-8?q?ring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.11__add_origin.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql index f84245a0d4..c2cf2e6c22 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.11__add_origin.sql @@ -1,5 +1,6 @@ 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 From 89acf1aea3074a25f212380a98131da46849d29e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 13 Apr 2021 17:03:53 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E6=96=B0=E5=A2=9Earea=5Fcode=EF=BC=8Cdb=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.4__area_code.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql index 40b002fab6..e81f6b0f73 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.4__area_code.sql @@ -21,4 +21,4 @@ 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 '部门所属的行政地区编码:实际就是所属组织的地区编码' BEFORE DEL_FLAG; \ No newline at end of file +alter table customer_department add COLUMN AREA_CODE VARCHAR(64) comment '部门所属的行政地区编码:实际就是所属组织的地区编码' AFTER TOTAL_USER; \ No newline at end of file