diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index ff720312..d59f29fa 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -12,7 +12,7 @@ 0 1.0 18 - 396 + 431 128 128 @@ -41,10 +41,10 @@ false - db\mysql\core.sql + db\core.sql UTF-8 CR+LF - false + true 7be191506f9daa8070b3ac14921dffd44063d2bb null @@ -89,7 +89,7 @@ true - db\module_core.png + db\core.png true true @@ -1032,7 +1032,7 @@ nvarchar(n) - 8e6503837a4993eab7dd018391909b3a9185f0bd + 46d0f56aace23d853693d4e581e9904d463b8860 100 null false @@ -1043,10 +1043,26 @@ false 英文名 - 英文名 + 员工英文名 emp_name_en varchar(n) + + c3398bbf1c346a338db14449fcb9fa2f6c70f372 + 100 + null + false + null + false + false + false + + false + + 员工工号 + emp_no + nvarchar(n) + d903f31236ff7a6701ff92a19986146ace84c236 null @@ -4388,7 +4404,7 @@ - 8a72200fa40d6b695965f7394412ff219269f8bd + a94020550e7bc4d31384f96700f2c31721d49880 26e4b2554a744e584fba5f3b88c267026359e727 54d156398db07de97741ea8035283f424eae82dc -1 @@ -4442,7 +4458,7 @@ 2f7bbb8699e51f6ae50ccbab765f8de4a402cad2 ab8b402ea35a78cdadd5ed446d571c9a80b532ee - 8a72200fa40d6b695965f7394412ff219269f8bd + a94020550e7bc4d31384f96700f2c31721d49880 @@ -7129,7 +7145,7 @@ - 968d12779004284e9a5086a1c15b2b1b5c25da4c + 9a24a5fe2b90473016e496df5121ad7b1f2cfe4c 26e4b2554a744e584fba5f3b88c267026359e727 0ded13a505cc3bfde24edfbae369231be192a59b -1 @@ -7590,7 +7606,7 @@ f22a1cfec76101d87da3a951bb05d7700418c1c1 ab8b402ea35a78cdadd5ed446d571c9a80b532ee - 968d12779004284e9a5086a1c15b2b1b5c25da4c + 9a24a5fe2b90473016e496df5121ad7b1f2cfe4c 用户类型引用编号，例如如：当user_type为1员工的时候，ref_code关联的为emp_code 用户类型引用编号 @@ -12585,7 +12601,7 @@ false true - idx_sys_msg_inner_r_status + idx_sys_msg_inner_r_stat @@ -14751,7 +14767,7 @@ - f50781f370e11ee22b60c8cbf3ee46fe3d31592b + 5c633b8026bdc419fe015e88d5a2e8c2622e7f1c 26e4b2554a744e584fba5f3b88c267026359e727 f151f987251ae4e9949b5ed48822458897360e0b -1 @@ -14860,7 +14876,7 @@ 5eed2939e1d63782c6ef3363e98724114c4a5f6a ab8b402ea35a78cdadd5ed446d571c9a80b532ee - f50781f370e11ee22b60c8cbf3ee46fe3d31592b + 5c633b8026bdc419fe015e88d5a2e8c2622e7f1c @@ -16303,7 +16319,7 @@ - dc62d8a8ae47139bde65fdea22fb08ec869cb5ba + 45922c254c3b94aa89bf37d0dd2f3c7665aabcc2 e358008a1c9b84f744e89039339ba56765fe34bd 26e4b2554a744e584fba5f3b88c267026359e727 -1 @@ -16325,7 +16341,7 @@ null - a879d42851b5e1de227ec1be77e5e9829bf3e554 + 1f685cf44fc37577bc9d75f175ec6820d986117b f24ec280de439487a7e35a62e11a445e7adbd9b6 26e4b2554a744e584fba5f3b88c267026359e727 -1 @@ -16421,7 +16437,7 @@ - 8e6503837a4993eab7dd018391909b3a9185f0bd + 46d0f56aace23d853693d4e581e9904d463b8860 28440c39441334f1eacbfa49440ebfc746edbada @@ -16453,10 +16469,43 @@ 0 + + c3398bbf1c346a338db14449fcb9fa2f6c70f372 + d46df317a3e234d6fa23d149f1b0e61126beaf92 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + b0ac1bfb9a465a46257d8e043e8d0370feb0ee7c 512f24dbe486a211117dfb58e689ef3e0e5009a0 - a879d42851b5e1de227ec1be77e5e9829bf3e554 + 1f685cf44fc37577bc9d75f175ec6820d986117b @@ -16523,7 +16572,7 @@ 76ab6ac096fb9c9be7bf61df683ce21a3da0c33d 5ac7f3a7a755a58e6119c8d4922df644559e632f - dc62d8a8ae47139bde65fdea22fb08ec869cb5ba + 45922c254c3b94aa89bf37d0dd2f3c7665aabcc2 diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index 9dc74538..3b6c6e00 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -261,6 +261,7 @@ CREATE TABLE js_sys_employee emp_code varchar(64) NOT NULL, emp_name vargraphic(100) NOT NULL, emp_name_en varchar(100), + emp_no vargraphic(100), office_code varchar(64) NOT NULL, office_name vargraphic(100) NOT NULL, company_code varchar(64), @@ -898,7 +899,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code); CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date); CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id); CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code); -CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status); +CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status); CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star); CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type); CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code); diff --git a/modules/core/db/h2/core.sql b/modules/core/db/h2/core.sql index 4c1f29ab..b27b3fdc 100644 --- a/modules/core/db/h2/core.sql +++ b/modules/core/db/h2/core.sql @@ -261,6 +261,7 @@ CREATE TABLE js_sys_employee emp_code varchar(64) NOT NULL, emp_name varchar(100) NOT NULL, emp_name_en varchar(100), + emp_no varchar(100), office_code varchar(64) NOT NULL, office_name varchar(100) NOT NULL, company_code varchar(64), @@ -898,7 +899,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code); CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date); CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id); CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code); -CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status); +CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status); CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star); CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type); CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code); diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index 2b71afdf..4ba8bbe1 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -261,6 +261,7 @@ CREATE TABLE [js_sys_employee] [emp_code] varchar(64) NOT NULL, [emp_name] nvarchar(100) NOT NULL, [emp_name_en] varchar(100), + [emp_no] nvarchar(100), [office_code] varchar(64) NOT NULL, [office_name] nvarchar(100) NOT NULL, [company_code] varchar(64), @@ -898,7 +899,7 @@ CREATE INDEX [idx_sys_msg_inner_sc] ON [js_sys_msg_inner] ([send_user_code]); CREATE INDEX [idx_sys_msg_inner_sd] ON [js_sys_msg_inner] ([send_date]); CREATE INDEX [idx_sys_msg_inner_r_mi] ON [js_sys_msg_inner_record] ([msg_inner_id]); CREATE INDEX [idx_sys_msg_inner_r_ruc] ON [js_sys_msg_inner_record] ([receive_user_code]); -CREATE INDEX [idx_sys_msg_inner_r_status] ON [js_sys_msg_inner_record] ([read_status]); +CREATE INDEX [idx_sys_msg_inner_r_stat] ON [js_sys_msg_inner_record] ([read_status]); CREATE INDEX [idx_sys_msg_inner_r_star] ON [js_sys_msg_inner_record] ([is_star]); CREATE INDEX [idx_sys_msg_push_type] ON [js_sys_msg_push] ([msg_type]); CREATE INDEX [idx_sys_msg_push_rc] ON [js_sys_msg_push] ([receive_code]); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index f4ffda79..4041545d 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -261,7 +261,8 @@ CREATE TABLE js_sys_employee ( emp_code varchar(64) NOT NULL COMMENT '员工编码', emp_name varchar(100) NOT NULL COMMENT '员工姓名', - emp_name_en varchar(100) COMMENT '英文名', + emp_name_en varchar(100) COMMENT '员工英文名', + emp_no varchar(100) COMMENT '员工工号', office_code varchar(64) NOT NULL COMMENT '机构编码', office_name varchar(100) NOT NULL COMMENT '机构名称', company_code varchar(64) COMMENT '公司编码', @@ -899,7 +900,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code ASC); CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date ASC); CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id ASC); CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code ASC); -CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status ASC); +CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status ASC); CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star ASC); CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type ASC); CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code ASC); diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index af67d1ef..b2a420e2 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -261,6 +261,7 @@ CREATE TABLE js_sys_employee emp_code varchar2(64) NOT NULL, emp_name nvarchar2(100) NOT NULL, emp_name_en varchar2(100), + emp_no nvarchar2(100), office_code varchar2(64) NOT NULL, office_name nvarchar2(100) NOT NULL, company_code varchar2(64), @@ -898,7 +899,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code); CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date); CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id); CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code); -CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status); +CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status); CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star); CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type); CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code); @@ -1126,7 +1127,8 @@ COMMENT ON COLUMN js_sys_dict_type.remarks IS '备注信息'; COMMENT ON TABLE js_sys_employee IS '员工表'; COMMENT ON COLUMN js_sys_employee.emp_code IS '员工编码'; COMMENT ON COLUMN js_sys_employee.emp_name IS '员工姓名'; -COMMENT ON COLUMN js_sys_employee.emp_name_en IS '英文名'; +COMMENT ON COLUMN js_sys_employee.emp_name_en IS '员工英文名'; +COMMENT ON COLUMN js_sys_employee.emp_no IS '员工工号'; COMMENT ON COLUMN js_sys_employee.office_code IS '机构编码'; COMMENT ON COLUMN js_sys_employee.office_name IS '机构名称'; COMMENT ON COLUMN js_sys_employee.company_code IS '公司编码'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 41993b68..7d5cb2c3 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -261,6 +261,7 @@ CREATE TABLE js_sys_employee emp_code varchar(64) NOT NULL, emp_name varchar(100) NOT NULL, emp_name_en varchar(100), + emp_no varchar(100), office_code varchar(64) NOT NULL, office_name varchar(100) NOT NULL, company_code varchar(64), @@ -898,7 +899,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code); CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date); CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id); CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code); -CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status); +CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status); CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star); CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type); CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code); @@ -1126,7 +1127,8 @@ COMMENT ON COLUMN js_sys_dict_type.remarks IS '备注信息'; COMMENT ON TABLE js_sys_employee IS '员工表'; COMMENT ON COLUMN js_sys_employee.emp_code IS '员工编码'; COMMENT ON COLUMN js_sys_employee.emp_name IS '员工姓名'; -COMMENT ON COLUMN js_sys_employee.emp_name_en IS '英文名'; +COMMENT ON COLUMN js_sys_employee.emp_name_en IS '员工英文名'; +COMMENT ON COLUMN js_sys_employee.emp_no IS '员工工号'; COMMENT ON COLUMN js_sys_employee.office_code IS '机构编码'; COMMENT ON COLUMN js_sys_employee.office_name IS '机构名称'; COMMENT ON COLUMN js_sys_employee.company_code IS '公司编码'; 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 76ccd07e..bf1cb256 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.8.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.8.sql index 80312c09..9f3024c8 100644 --- a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.8.sql +++ b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.8.sql @@ -4,4 +4,4 @@ ALTER TABLE ${_prefix}sys_employee ADD emp_no varchar(100) NULL; -- 新增 BPM 模块 INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks) -VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', now(), 'system', now(), NULL); +VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.x', NULL, '0', 'system', getdate(), 'system', getdate(), NULL); diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.8.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.8.sql index 28d10e89..4e0118a2 100644 --- a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.8.sql +++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.8.sql @@ -5,4 +5,4 @@ ADD COLUMN `emp_no` varchar(100) NULL COMMENT '员工工号' AFTER `emp_code`; -- 新增 BPM 模块 INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks) -VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', now(), 'system', now(), NULL); +VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.x', NULL, '0', 'system', now(), 'system', now(), NULL); diff --git a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.8.sql b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.8.sql index 93d9300c..7ccb6d02 100644 --- a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.8.sql +++ b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.8.sql @@ -5,4 +5,4 @@ COMMENT ON COLUMN ${_prefix}sys_employee.emp_no IS '员工工号'; -- 新增 BPM 模块 INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks) -VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', sysdate, 'system', sysdate, NULL); +VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.x', NULL, '0', 'system', sysdate, 'system', sysdate, NULL); diff --git a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.8.sql b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.8.sql index 2cd5b6a3..a08556e6 100644 --- a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.8.sql +++ b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.8.sql @@ -5,4 +5,4 @@ COMMENT ON COLUMN ${_prefix}sys_employee.emp_no IS '员工工号'; -- 新增 BPM 模块 INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks) -VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', now(), 'system', now(), NULL); +VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.x', NULL, '0', 'system', now(), 'system', now(), NULL); diff --git a/modules/core/src/main/resources/db/upgrade/core/versions b/modules/core/src/main/resources/db/upgrade/core/versions index 4d79e119..56c4ac67 100644 --- a/modules/core/src/main/resources/db/upgrade/core/versions +++ b/modules/core/src/main/resources/db/upgrade/core/versions @@ -13,4 +13,5 @@ 4.1.4 4.1.5 4.1.6 -4.1.7 \ No newline at end of file +4.1.7 +4.1.8 \ No newline at end of file diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql index 2b71afdf..4ba8bbe1 100644 --- a/web/db/mssql/core.sql +++ b/web/db/mssql/core.sql @@ -261,6 +261,7 @@ CREATE TABLE [js_sys_employee] [emp_code] varchar(64) NOT NULL, [emp_name] nvarchar(100) NOT NULL, [emp_name_en] varchar(100), + [emp_no] nvarchar(100), [office_code] varchar(64) NOT NULL, [office_name] nvarchar(100) NOT NULL, [company_code] varchar(64), @@ -898,7 +899,7 @@ CREATE INDEX [idx_sys_msg_inner_sc] ON [js_sys_msg_inner] ([send_user_code]); CREATE INDEX [idx_sys_msg_inner_sd] ON [js_sys_msg_inner] ([send_date]); CREATE INDEX [idx_sys_msg_inner_r_mi] ON [js_sys_msg_inner_record] ([msg_inner_id]); CREATE INDEX [idx_sys_msg_inner_r_ruc] ON [js_sys_msg_inner_record] ([receive_user_code]); -CREATE INDEX [idx_sys_msg_inner_r_status] ON [js_sys_msg_inner_record] ([read_status]); +CREATE INDEX [idx_sys_msg_inner_r_stat] ON [js_sys_msg_inner_record] ([read_status]); CREATE INDEX [idx_sys_msg_inner_r_star] ON [js_sys_msg_inner_record] ([is_star]); CREATE INDEX [idx_sys_msg_push_type] ON [js_sys_msg_push] ([msg_type]); CREATE INDEX [idx_sys_msg_push_rc] ON [js_sys_msg_push] ([receive_code]); diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index f4ffda79..4041545d 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -261,7 +261,8 @@ CREATE TABLE js_sys_employee ( emp_code varchar(64) NOT NULL COMMENT '员工编码', emp_name varchar(100) NOT NULL COMMENT '员工姓名', - emp_name_en varchar(100) COMMENT '英文名', + emp_name_en varchar(100) COMMENT '员工英文名', + emp_no varchar(100) COMMENT '员工工号', office_code varchar(64) NOT NULL COMMENT '机构编码', office_name varchar(100) NOT NULL COMMENT '机构名称', company_code varchar(64) COMMENT '公司编码', @@ -899,7 +900,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code ASC); CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date ASC); CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id ASC); CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code ASC); -CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status ASC); +CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status ASC); CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star ASC); CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type ASC); CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code ASC); diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index af67d1ef..b2a420e2 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -261,6 +261,7 @@ CREATE TABLE js_sys_employee emp_code varchar2(64) NOT NULL, emp_name nvarchar2(100) NOT NULL, emp_name_en varchar2(100), + emp_no nvarchar2(100), office_code varchar2(64) NOT NULL, office_name nvarchar2(100) NOT NULL, company_code varchar2(64), @@ -898,7 +899,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code); CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date); CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id); CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code); -CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status); +CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status); CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star); CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type); CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code); @@ -1126,7 +1127,8 @@ COMMENT ON COLUMN js_sys_dict_type.remarks IS '备注信息'; COMMENT ON TABLE js_sys_employee IS '员工表'; COMMENT ON COLUMN js_sys_employee.emp_code IS '员工编码'; COMMENT ON COLUMN js_sys_employee.emp_name IS '员工姓名'; -COMMENT ON COLUMN js_sys_employee.emp_name_en IS '英文名'; +COMMENT ON COLUMN js_sys_employee.emp_name_en IS '员工英文名'; +COMMENT ON COLUMN js_sys_employee.emp_no IS '员工工号'; COMMENT ON COLUMN js_sys_employee.office_code IS '机构编码'; COMMENT ON COLUMN js_sys_employee.office_name IS '机构名称'; COMMENT ON COLUMN js_sys_employee.company_code IS '公司编码'; diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index 41993b68..7d5cb2c3 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -261,6 +261,7 @@ CREATE TABLE js_sys_employee emp_code varchar(64) NOT NULL, emp_name varchar(100) NOT NULL, emp_name_en varchar(100), + emp_no varchar(100), office_code varchar(64) NOT NULL, office_name varchar(100) NOT NULL, company_code varchar(64), @@ -898,7 +899,7 @@ CREATE INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner (send_user_code); CREATE INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner (send_date); CREATE INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record (msg_inner_id); CREATE INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record (receive_user_code); -CREATE INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record (read_status); +CREATE INDEX idx_sys_msg_inner_r_stat ON js_sys_msg_inner_record (read_status); CREATE INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record (is_star); CREATE INDEX idx_sys_msg_push_type ON js_sys_msg_push (msg_type); CREATE INDEX idx_sys_msg_push_rc ON js_sys_msg_push (receive_code); @@ -1126,7 +1127,8 @@ COMMENT ON COLUMN js_sys_dict_type.remarks IS '备注信息'; COMMENT ON TABLE js_sys_employee IS '员工表'; COMMENT ON COLUMN js_sys_employee.emp_code IS '员工编码'; COMMENT ON COLUMN js_sys_employee.emp_name IS '员工姓名'; -COMMENT ON COLUMN js_sys_employee.emp_name_en IS '英文名'; +COMMENT ON COLUMN js_sys_employee.emp_name_en IS '员工英文名'; +COMMENT ON COLUMN js_sys_employee.emp_no IS '员工工号'; COMMENT ON COLUMN js_sys_employee.office_code IS '机构编码'; COMMENT ON COLUMN js_sys_employee.office_name IS '机构名称'; COMMENT ON COLUMN js_sys_employee.company_code IS '公司编码';