From b3aa7d46818f4bf0c943f7d0b68353c570540247 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 12 Nov 2019 23:37:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E9=99=84=E5=B1=9E=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=85=81=E8=AE=B8=E7=9B=B8=E5=90=8C=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E5=B2=97=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/db/core.erm | 826 +++++++++--------- modules/core/db/db2/core.sql | 4 +- modules/core/db/mssql/core.sql | 4 +- modules/core/db/mysql/core.sql | 3 +- modules/core/db/oracle/core.sql | 4 +- modules/core/db/postgresql/core.sql | 4 +- .../jeesite/modules/sys/db/InitCoreData.xlsx | Bin 169077 -> 169086 bytes web/db/db2/core.sql | 4 +- web/db/mssql/core.sql | 4 +- web/db/mysql/core.sql | 3 +- web/db/oracle/core.sql | 4 +- web/db/postgresql/core.sql | 4 +- 12 files changed, 431 insertions(+), 433 deletions(-) diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 397f1862..ff720312 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -12,7 +12,7 @@ 0 1.0 18 - 2101 + 396 128 128 @@ -7114,414 +7114,6 @@ - - 26e4b2554a744e584fba5f3b88c267026359e727 - 438 - 383 - Segoe UI - 9 - 515 - 468 - - 128 - 128 - 192 - - - - dc62d8a8ae47139bde65fdea22fb08ec869cb5ba - e358008a1c9b84f744e89039339ba56765fe34bd - 26e4b2554a744e584fba5f3b88c267026359e727 - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 0..1 - true - - RESTRICT - RESTRICT - null - null - - - a879d42851b5e1de227ec1be77e5e9829bf3e554 - f24ec280de439487a7e35a62e11a445e7adbd9b6 - 26e4b2554a744e584fba5f3b88c267026359e727 - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 1 - true - - RESTRICT - RESTRICT - null - null - - - js_sys_employee - 员工表 - - - - - - - 0eb719cd3d6524bc3778d73c3634c1b976baa3c7 - ab8b402ea35a78cdadd5ed446d571c9a80b532ee - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 125f4be73b069fa39d11d391ebc30169bb835827 - e0ee6264e4415cc7d534335a38f6dbec62822900 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 8e6503837a4993eab7dd018391909b3a9185f0bd - 28440c39441334f1eacbfa49440ebfc746edbada - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - b0ac1bfb9a465a46257d8e043e8d0370feb0ee7c - 512f24dbe486a211117dfb58e689ef3e0e5009a0 - a879d42851b5e1de227ec1be77e5e9829bf3e554 - - - - - varchar(n) - - - false - true - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2b8439b512c0d6df70ca5f7c65bfd30a32def655 - 2f53aa3a1613598e128ad9cab02374b32d9bf70b - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 76ab6ac096fb9c9be7bf61df683ce21a3da0c33d - 5ac7f3a7a755a58e6119c8d4922df644559e632f - dc62d8a8ae47139bde65fdea22fb08ec869cb5ba - - - - - varchar(n) - - - false - true - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f0f47249781a8c1e655ae11236426b788f099fce - 653e75ecac41402f2d2bcea19230b9cb17536776 - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - cf949a5f8d12902f0a8384fa68c72f55e6136812 - ebe0900f7c091a4c0c47ec7fb29f4a9d586cf74b - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 85024a2953cf3e3c9c1cce49b2351853ab0d125b - ea920cba2fe0eaee64a2310ece7cda4b198b37ec - - - - false - true - idx_sys_employee_cco - - - - - 76ab6ac096fb9c9be7bf61df683ce21a3da0c33d - false - - - - - false - true - idx_sys_employee_cc - - - - - b8ea4b73d6d32a222e5abfd453287575ae518480 - false - - - - - false - true - idx_sys_employee_ud - - - - - ee78b079f7d319bf8119fd01439cd97424ff49fa - false - - - - - false - true - idx_sys_employee_oc - - - - - b0ac1bfb9a465a46257d8e043e8d0370feb0ee7c - false - - - - - false - true - idx_sys_employee_status - - - - - ebe0900f7c091a4c0c47ec7fb29f4a9d586cf74b - false - - - - - - - - - -
0ded13a505cc3bfde24edfbae369231be192a59b1283 @@ -15245,8 +14837,8 @@ falsefalsetrue - false - true + true + false @@ -15279,7 +14871,7 @@ false true true - true + false false @@ -15313,7 +14905,7 @@ false true true - true + false false @@ -16696,6 +16288,414 @@
+ + 26e4b2554a744e584fba5f3b88c267026359e727 + 438 + 383 + Segoe UI + 9 + 515 + 468 + + 128 + 128 + 192 + + + + dc62d8a8ae47139bde65fdea22fb08ec869cb5ba + e358008a1c9b84f744e89039339ba56765fe34bd + 26e4b2554a744e584fba5f3b88c267026359e727 + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 0..1 + true + + RESTRICT + RESTRICT + null + null + + + a879d42851b5e1de227ec1be77e5e9829bf3e554 + f24ec280de439487a7e35a62e11a445e7adbd9b6 + 26e4b2554a744e584fba5f3b88c267026359e727 + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 1 + true + + RESTRICT + RESTRICT + null + null + + + js_sys_employee + 员工表 + + + + + + + 0eb719cd3d6524bc3778d73c3634c1b976baa3c7 + ab8b402ea35a78cdadd5ed446d571c9a80b532ee + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 125f4be73b069fa39d11d391ebc30169bb835827 + e0ee6264e4415cc7d534335a38f6dbec62822900 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8e6503837a4993eab7dd018391909b3a9185f0bd + 28440c39441334f1eacbfa49440ebfc746edbada + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b0ac1bfb9a465a46257d8e043e8d0370feb0ee7c + 512f24dbe486a211117dfb58e689ef3e0e5009a0 + a879d42851b5e1de227ec1be77e5e9829bf3e554 + + + + + varchar(n) + + + false + true + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2b8439b512c0d6df70ca5f7c65bfd30a32def655 + 2f53aa3a1613598e128ad9cab02374b32d9bf70b + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 76ab6ac096fb9c9be7bf61df683ce21a3da0c33d + 5ac7f3a7a755a58e6119c8d4922df644559e632f + dc62d8a8ae47139bde65fdea22fb08ec869cb5ba + + + + + varchar(n) + + + false + true + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f0f47249781a8c1e655ae11236426b788f099fce + 653e75ecac41402f2d2bcea19230b9cb17536776 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cf949a5f8d12902f0a8384fa68c72f55e6136812 + ebe0900f7c091a4c0c47ec7fb29f4a9d586cf74b + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + + + + false + true + idx_sys_employee_cco + + + + + 76ab6ac096fb9c9be7bf61df683ce21a3da0c33d + false + + + + + false + true + idx_sys_employee_cc + + + + + b8ea4b73d6d32a222e5abfd453287575ae518480 + false + + + + + false + true + idx_sys_employee_ud + + + + + ee78b079f7d319bf8119fd01439cd97424ff49fa + false + + + + + false + true + idx_sys_employee_oc + + + + + b0ac1bfb9a465a46257d8e043e8d0370feb0ee7c + false + + + + + false + true + idx_sys_employee_status + + + + + ebe0900f7c091a4c0c47ec7fb29f4a9d586cf74b + false + + + + + + + + + +
diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index 532ab004..9dc74538 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar(64) NOT NULL UNIQUE, + id varchar(64) NOT NULL, emp_code varchar(64) NOT NULL, office_code varchar(64) NOT NULL, post_code varchar(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ); diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index ad978cba..2b71afdf 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -280,11 +280,11 @@ CREATE TABLE [js_sys_employee] -- 员工附属机构关系表 CREATE TABLE [js_sys_employee_office] ( - [id] varchar(64) NOT NULL UNIQUE, + [id] varchar(64) NOT NULL, [emp_code] varchar(64) NOT NULL, [office_code] varchar(64) NOT NULL, [post_code] varchar(64), - PRIMARY KEY ([emp_code], [office_code]) + PRIMARY KEY ([id]) ); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 0189f345..f4ffda79 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -285,8 +285,7 @@ CREATE TABLE js_sys_employee_office emp_code varchar(64) NOT NULL COMMENT '员工编码', office_code varchar(64) NOT NULL COMMENT '机构编码', post_code varchar(64) COMMENT '岗位编码', - PRIMARY KEY (emp_code, office_code), - UNIQUE (id) + PRIMARY KEY (id) ) COMMENT = '员工附属机构关系表'; diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index f34f7f1e..af67d1ef 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar2(64) NOT NULL UNIQUE, + id varchar2(64) NOT NULL, emp_code varchar2(64) NOT NULL, office_code varchar2(64) NOT NULL, post_code varchar2(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ); diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 4a591dfe..41993b68 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar(64) NOT NULL UNIQUE, + id varchar(64) NOT NULL, emp_code varchar(64) NOT NULL, office_code varchar(64) NOT NULL, post_code varchar(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ) WITHOUT OIDS; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index e7d996269c1b2d7477f986b76821da1216b33ea0..76ccd07efdb7ee1900e769be13b12ba134581cb1 100644 GIT binary patch delta 8163 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 T{3SM|Z3>VOBP{%(4wU}^J+cvE diff --git a/web/db/db2/core.sql b/web/db/db2/core.sql index 532ab004..9dc74538 100644 --- a/web/db/db2/core.sql +++ b/web/db/db2/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar(64) NOT NULL UNIQUE, + id varchar(64) NOT NULL, emp_code varchar(64) NOT NULL, office_code varchar(64) NOT NULL, post_code varchar(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ); diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql index ad978cba..2b71afdf 100644 --- a/web/db/mssql/core.sql +++ b/web/db/mssql/core.sql @@ -280,11 +280,11 @@ CREATE TABLE [js_sys_employee] -- 员工附属机构关系表 CREATE TABLE [js_sys_employee_office] ( - [id] varchar(64) NOT NULL UNIQUE, + [id] varchar(64) NOT NULL, [emp_code] varchar(64) NOT NULL, [office_code] varchar(64) NOT NULL, [post_code] varchar(64), - PRIMARY KEY ([emp_code], [office_code]) + PRIMARY KEY ([id]) ); diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index 0189f345..f4ffda79 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -285,8 +285,7 @@ CREATE TABLE js_sys_employee_office emp_code varchar(64) NOT NULL COMMENT '员工编码', office_code varchar(64) NOT NULL COMMENT '机构编码', post_code varchar(64) COMMENT '岗位编码', - PRIMARY KEY (emp_code, office_code), - UNIQUE (id) + PRIMARY KEY (id) ) COMMENT = '员工附属机构关系表'; diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index f34f7f1e..af67d1ef 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar2(64) NOT NULL UNIQUE, + id varchar2(64) NOT NULL, emp_code varchar2(64) NOT NULL, office_code varchar2(64) NOT NULL, post_code varchar2(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ); diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index 4a591dfe..41993b68 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar(64) NOT NULL UNIQUE, + id varchar(64) NOT NULL, emp_code varchar(64) NOT NULL, office_code varchar(64) NOT NULL, post_code varchar(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ) WITHOUT OIDS;