From 5779beacff4983c8a2a378be88a25a59d5a28793 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 3 Aug 2022 18:35:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E6=A0=87=E8=84=9A=E6=9C=AC=E5=AE=8C?= =?UTF-8?q?=E5=96=84=EF=BC=8CBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/脚本/Mysql/系统人员信息改造.sql | 5 +- docs/脚本/Mysql/组织架构图触发器.sql | 38 +- docs/脚本/Mysql/表结构、初始化数据.sql | 11 +- docs/脚本/Oracle/Oracle.sql | 752 ++++++++++++++++++ docs/脚本/SqlServer/系统人员信息改造.sql | 113 +-- docs/脚本/SqlServer/组织架构图触发器.sql | 124 ++- docs/脚本/SqlServer/表结构、基础数据.sql | 11 +- .../service/impl/StaffServiceImpl.java | 11 +- .../cusfielddata/CusFieldDataTrigger.java | 9 + 9 files changed, 871 insertions(+), 203 deletions(-) create mode 100644 docs/脚本/Oracle/Oracle.sql diff --git a/docs/脚本/Mysql/系统人员信息改造.sql b/docs/脚本/Mysql/系统人员信息改造.sql index 7b431d67..3659d8a7 100644 --- a/docs/脚本/Mysql/系统人员信息改造.sql +++ b/docs/脚本/Mysql/系统人员信息改造.sql @@ -16,8 +16,10 @@ where ifnull(zd.forbidden_tag,0)<>1 and ifnull(zd.delete_type,0)<>1; create view v_jcl_post as select id*-1 fid,post_name fname,0 fparentid from JCL_ORG_POST +where ifnull(delete_type,0)<>1 union -select id,post_info_name,post_id*-1 from JCL_ORG_POST_INFO; +select id,post_info_name,post_id*-1 from JCL_ORG_POST_INFO +where ifnull(forbidden_tag,0)<>1 and ifnull(delete_type,0)<>1; @@ -338,7 +340,6 @@ update hrm_formfield set isuse=1,ismand=1,allowhide=-1 where fieldname='sex'; update hrm_formfield set isuse=1,ismand=0,allowhide=-1 where fieldname='departmentid'; update hrm_formfield set isuse=1,ismand=0,allowhide=-1 where fieldname='jobtitle'; update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobactivity'; -update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='status'; update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='joblevel'; update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobcall'; update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobGroupId'; diff --git a/docs/脚本/Mysql/组织架构图触发器.sql b/docs/脚本/Mysql/组织架构图触发器.sql index 48bb61a1..1fe5eed3 100644 --- a/docs/脚本/Mysql/组织架构图触发器.sql +++ b/docs/脚本/Mysql/组织架构图触发器.sql @@ -245,8 +245,9 @@ DELIMITER ; DELIMITER $$ -create trigger JCL_ORG_COMP_del after delete on JCL_ORG_COMP FOR EACH ROW +create trigger JCL_ORG_COMP_del after update on JCL_ORG_COMP FOR EACH ROW begin + declare _deletetype int; declare _ftype int; declare _fobjid int; declare _fdatebegin date; @@ -254,11 +255,11 @@ begin set _ftype=1; set _fobjid =old.id; select cast(now() as date) into _fdatebegin; - - delete from jcl_org_map where ftype=1 and fobjid=_fobjid and fdatebegin=_fdatebegin; - - - update jcl_org_map set fdateend=date_add(_fdatebegin,interval -1 day) where ftype=1 and fobjid=_fobjid and fdateend>_fdatebegin; + set _deletetype = new.delete_type; + if NEW.delete_type <> OLD.delete_type then + delete from jcl_org_map where ftype=1 and fobjid=_fobjid and fdatebegin=_fdatebegin; + update jcl_org_map set fdateend=date_add(_fdatebegin,interval -1 day) where ftype=1 and fobjid=_fobjid and fdateend>_fdatebegin; + end if; END $$ DELIMITER ; @@ -462,8 +463,9 @@ DELIMITER ; DELIMITER $$ -create trigger JCL_ORG_dept_del after delete on JCL_ORG_dept FOR EACH ROW +create trigger JCL_ORG_dept_del after update on JCL_ORG_dept FOR EACH ROW BEGIN + declare _deletetype int; declare _ftype int; declare _fobjid int; declare _fdatebegin date; @@ -471,10 +473,11 @@ BEGIN set _ftype=2; set _fobjid = old.id; select cast(now() as date) into _fdatebegin; - - delete from jcl_org_map where ftype=_ftype and fobjid=_fobjid and fdatebegin=_fdatebegin; - - update jcl_org_map set fdateend=date_add(_fdatebegin,interval -1 day) where ftype=_ftype and fobjid=_fobjid and fdateend>_fdatebegin; + set _deletetype = new.delete_type; + if NEW.delete_type <> OLD.delete_type then + delete from jcl_org_map where ftype=_ftype and fobjid=_fobjid and fdatebegin=_fdatebegin; + update jcl_org_map set fdateend=date_add(_fdatebegin,interval -1 day) where ftype=_ftype and fobjid=_fobjid and fdateend>_fdatebegin; + end if; END $$ DELIMITER ; @@ -658,8 +661,9 @@ DELIMITER ; DELIMITER $$ -create trigger JCL_ORG_job_del after delete on JCL_ORG_JOB FOR EACH ROW +create trigger JCL_ORG_job_del after update on JCL_ORG_JOB FOR EACH ROW begin + declare _deletetype int; declare _ftype int; declare _fobjid int; declare _fdatebegin date; @@ -667,11 +671,11 @@ begin set _ftype=3; set _fobjid = old.id; select cast(now() as date) into _fdatebegin; - - delete from jcl_org_map where ftype=_ftype and fobjid=_fobjid and fdatebegin=_fdatebegin; - - - update jcl_org_map set fdateend=date_add(_fdatebegin,interval -1 day) where ftype=_ftype and fobjid=_fobjid and fdateend>_fdatebegin; + set _deletetype = new.delete_type; + if NEW.delete_type <> OLD.delete_type then + delete from jcl_org_map where ftype=_ftype and fobjid=_fobjid and fdatebegin=_fdatebegin; + update jcl_org_map set fdateend=date_add(_fdatebegin,interval -1 day) where ftype=_ftype and fobjid=_fobjid and fdateend>_fdatebegin; + end if; END $$ DELIMITER ; diff --git a/docs/脚本/Mysql/表结构、初始化数据.sql b/docs/脚本/Mysql/表结构、初始化数据.sql index 817a815f..851a267a 100644 --- a/docs/脚本/Mysql/表结构、初始化数据.sql +++ b/docs/脚本/Mysql/表结构、初始化数据.sql @@ -404,7 +404,8 @@ CREATE TABLE `jcl_org_level` ( DROP TABLE IF EXISTS `jcl_org_map`; CREATE TABLE `jcl_org_map` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `fid` int(11) NOT NULL AUTO_INCREMENT, + `id` int(11) NULL DEFAULT NULL, `ftype` int(11) NULL DEFAULT NULL, `fobjid` int(11) NULL DEFAULT NULL, `fecid` int(11) NULL DEFAULT NULL, @@ -414,7 +415,7 @@ CREATE TABLE `jcl_org_map` ( `fnumber` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `fname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `fleader` int(11) NULL DEFAULT NULL, - `fleaderimg` int(11) NULL DEFAULT NULL, + `fleaderimg` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `fleadername` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `fleaderjobid` int(11) NULL DEFAULT NULL, `fleaderjob` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -431,7 +432,7 @@ CREATE TABLE `jcl_org_map` ( `delete_type` int(11) NULL DEFAULT NULL, `create_time` datetime NULL DEFAULT NULL, `update_time` datetime NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE + PRIMARY KEY (`fid`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; @@ -631,9 +632,9 @@ insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (25, 3, 'JCL_ORG_JOB', 'work_duty', '任职职责', 'text', 2, 6, 1, 0, 1, 1, 1, 0, 1, 2, 1, 0, now(), NULL, NULL, NULL, 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (26, 3, 'JCL_ORG_JOB', 'ec_department', '所属部门', 'int', 3, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, now(), NULL, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (27, 3, 'JCL_ORG_JOB', 'work_authority', '工作权限', 'text', 2, 6, 1, 0, 1, 1, 1, 0, 1, 3, 1, 0, now(), NULL, NULL, NULL, 0); -insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (28, 3, 'JCL_ORG_JOB', 'level_id', '职等', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 3, 1, 0, now(), NULL, '162', '["browser",{"valueSpan":"自定义多选","replaceDatas":[{"itemorderid":"162","name":"自定义多选","id":"162","parenttitle":"集成","title":"集成-自定义多选"}],"value":"162"},{"valueSpan":"职等浏览按钮","replaceDatas":[{"showname":"LevelBrowser","name":"职等浏览按钮","id":"LevelBrowser"}],"value":"LevelBrowser"}]', 0); +insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (28, 3, 'JCL_ORG_JOB', 'level_id', '职等', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 4, 1, 0, now(), NULL, '162', '["browser",{"valueSpan":"自定义多选","replaceDatas":[{"itemorderid":"162","name":"自定义多选","id":"162","parenttitle":"集成","title":"集成-自定义多选"}],"value":"162"},{"valueSpan":"职等浏览按钮","replaceDatas":[{"showname":"LevelBrowser","name":"职等浏览按钮","id":"LevelBrowser"}],"value":"LevelBrowser"}]', 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 4, 1, 0, now(), NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0); -insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (30, 3, 'JCL_ORG_JOB', 'grade_id', '职级', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 4, 1, 0, now(), NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"itemorderid":"161","name":"自定义单选","id":"161","parenttitle":"集成","title":"集成-自定义单选"}],"value":"161"},{"valueSpan":"职级浏览按钮","replaceDatas":[{"showname":"gradeBrowser","name":"职级浏览按钮","id":"gradeBrowser"}],"value":"gradeBrowser"}]', 0); +insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (30, 3, 'JCL_ORG_JOB', 'grade_id', '职级', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 3, 1, 0, now(), NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"itemorderid":"161","name":"自定义单选","id":"161","parenttitle":"集成","title":"集成-自定义单选"}],"value":"161"},{"valueSpan":"职级浏览按钮","replaceDatas":[{"showname":"gradeBrowser","name":"职级浏览按钮","id":"gradeBrowser"}],"value":"gradeBrowser"}]', 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (31, 3, 'JCL_ORG_JOB', 'parent_job', '上级岗位', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, now(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"jobBrowser","valueSpan":"岗位浏览按钮","replaceDatas":[{"showname":"jobBrowser","shownamespan":"jobBrowser","namespan":"岗位浏览按钮","name":"岗位浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"jobBrowser","id":"jobBrowser"}]}]', 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (32, 3, 'JCL_ORG_JOB', 'is_key', '是否关键岗', 'int', 5, 3, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, now(), NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"否"},{"default":"","unuse":"0","id":"1","key":"1","option":"是"}],"sort":"horizontal"}]', 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (33, 3, 'JCL_ORG_JOB', 'workplace', '工作地点', 'varchar(100)', 1, 3, 1, 0, 1, 1, 1, 0, 1, 7, 1, 0, now(), NULL, '1', '["input","text","100"]', 0); diff --git a/docs/脚本/Oracle/Oracle.sql b/docs/脚本/Oracle/Oracle.sql new file mode 100644 index 00000000..2c15142f --- /dev/null +++ b/docs/脚本/Oracle/Oracle.sql @@ -0,0 +1,752 @@ +-- JCL_ORG_SCHEME +CREATE TABLE JCL_ORG_SCHEME ( + ID NUMBER NOT NULL, + SCHEME_NO NVARCHAR2(100) NULL, + SCHEME_NAME NVARCHAR2(100) NULL, + SCHEME_DESCRIPTION NVARCHAR2(1000) NULL, + FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_SCHEME_PK PRIMARY KEY (ID) +); +-- JCL_ORG_LEVEL +CREATE TABLE JCL_ORG_LEVEL ( + ID NUMBER NOT NULL, + LEVEL_NO NVARCHAR2(100) NULL, + LEVEL_NAME NVARCHAR2(100) NULL, + DESCRIPTION NVARCHAR2(1000) NULL, + SCHEME_ID NUMBER NULL, + FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_LEVEL_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_GRADE +CREATE TABLE JCL_ORG_GRADE ( + ID NUMBER NOT NULL, + GRADE_NO NVARCHAR2(100) NULL, + GRADE_NAME NVARCHAR2(100) NULL, + DESCRIPTION NVARCHAR2(1000) NULL, + SCHEME_ID NUMBER NULL, + LEVEL_ID NVARCHAR2(100) NULL, + FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_GRADE_PK PRIMARY KEY (ID) +); + + +-- JCL_ORG_SEQUENCE +CREATE TABLE JCL_ORG_SEQUENCE ( + ID NUMBER NOT NULL, + SEQUENCE_NO NVARCHAR2(100) NULL, + SEQUENCE_NAME NVARCHAR2(100) NULL, + DESCRIPTION NVARCHAR2(1000) NULL, + SCHEME_ID NUMBER NULL, + FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_SEQUENCE_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_POST +CREATE TABLE JCL_ORG_POST ( + ID NUMBER NOT NULL, + POST_NO NVARCHAR2(100) NULL, + POST_NAME NVARCHAR2(100) NULL, + DESCRIPTION NVARCHAR2(1000) NULL, + IS_USED NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_POST_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_POST_INFO +CREATE TABLE JCL_ORG_POST_INFO ( + ID NUMBER NOT NULL, + POST_INFO_NO NVARCHAR2(100) NULL, + POST_INFO_NAME NVARCHAR2(100) NULL, + POST_INFO_AUTHORITY NVARCHAR2(1000) NULL, + POST_INFO_DUTY NVARCHAR2(1000) NULL, + POST_INFO_QUALIFICATION NVARCHAR2(1000) NULL, + POST_ID NUMBER NULL, + DESCRIPTION NVARCHAR2(1000) NULL, + FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_POST_INFO_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_COMP +CREATE TABLE JCL_ORG_COMP ( + ID NUMBER NOT NULL, + COMP_NO NVARCHAR2(100) NULL, + COMP_NAME NVARCHAR2(100) NULL, + COMP_NAME_SHORT NVARCHAR2(100) NULL, + PARENT_COMPANY NUMBER NULL, + ORG_CODE NVARCHAR2(100) NULL, + INDUSTRY NUMBER NULL, + COMP_PRINCIPAL NUMBER NULL, + DESCRIPTION NVARCHAR2(1000) NULL, + FORBIDDEN_TAG NUMBER NULL, + SHOW_ORDER NUMBER NULL, + IS_USED NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + UUID NVARCHAR2(100) NULL, + CONSTRAINT JCL_ORG_COMP_PK PRIMARY KEY (ID) +); + +-- JCL_FIELD_EXTENDGROUP +CREATE TABLE JCL_FIELD_EXTENDGROUP ( + ID NUMBER NOT NULL, + PID NUMBER NULL, + EXTEND_TYPE NUMBER NULL, + GROUP_NAME NVARCHAR2(100) NULL, + SHOW_ORDER NUMBER null, + IS_SHOW NVARCHAR2(100) NULL, + IS_SYSTEM_DEFAULT NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_FIELD_EXTENDGROUP_PK PRIMARY KEY (ID) +); + +-- JCL_FIELD_EXTENDTITLE +CREATE TABLE JCL_FIELD_EXTENDTITLE ( + ID NUMBER NOT NULL, + GROUP_ID NUMBER NULL, + TITLE VARCHAR(100) NULL, + SHOW_ORDER NUMBER NULL, + IS_SHOW NUMBER NULL, + IS_SYSTEM_DEFAULT NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_FIELD_EXTENDTITLE_PK PRIMARY KEY (ID) +); + +-- JCL_FIELD_EXTENDINFO +CREATE TABLE JCL_FIELD_EXTENDINFO ( + ID NUMBER NOT NULL, + EXTEND_TYPE NUMBER NULL, + TABLE_NAME NVARCHAR2(100) NULL, + FIELD_NAME NVARCHAR2(100) NULL, + FIELD_NAME_DESC NVARCHAR2(100) NULL, + FIELD_TYPE NVARCHAR2(1000) NULL, + CONTROL_TYPE NUMBER NULL, + CUSTOM_VALUE NVARCHAR2(1000) NULL, + BROWSER_TYPE NVARCHAR2(100) NULL, + EXTEND_GROUP_ID NUMBER NULL, + ISENABLE NUMBER NULL, + ISREQUIRED NUMBER NULL, + LIST_SHOW NUMBER NULL, + SEARCH_SHOW NUMBER NULL, + EDIT_SHOW NUMBER NULL, + ADD_SHOW NUMBER NULL, + BROWSER_SHOW NUMBER NULL, + SHOW_ORDER NUMBER NULL, + IS_SYSTEM_DEFAULT NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_FIELD_EXTENDINFO_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_COMPEXT +CREATE TABLE JCL_ORG_COMPEXT ( + ID NUMBER NOT NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_COMPEXT_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_COMPEXT_DT1 +CREATE TABLE JCL_ORG_COMPEXT_DT1 ( + ID NUMBER NOT NULL, + MAINID NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_COMPEXT_DT1_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_DEPT +CREATE TABLE JCL_ORG_DEPT ( + ID NUMBER NOT NULL, + DEPT_NO NVARCHAR2(100) NULL, + DEPT_NAME NVARCHAR2(100) NULL, + DEPT_NAME_SHORT NVARCHAR2(100) NULL, + PARENT_COMP NUMBER NULL, + PARENT_DEPT NUMBER NULL, + DEPT_PRINCIPAL NUMBER NULL, + SHOW_ORDER NUMBER NULL, + DESCRIPTION NVARCHAR2(1000) NULL, + FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + UUID NVARCHAR2(100) NULL, + CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_DEPTEXT +CREATE TABLE JCL_ORG_DEPTEXT ( + ID NUMBER NOT NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_DEPTEXT_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_DEPTEXT_DT1 +CREATE TABLE JCL_ORG_DEPTEXT_DT1 ( + ID NUMBER NOT NULL, + MAINID NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_DEPTEXT_DT1_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_JOB +CREATE TABLE JCL_ORG_JOB ( + ID NUMBER NOT NULL, + JOB_NO NVARCHAR2(100) NULL, + JOB_NAME NVARCHAR2(100) NULL, + PARENT_COMP NUMBER NULL, + EC_COMPANY NUMBER NULL, + PARENT_DEPT NUMBER NULL, + EC_DEPARTMENT NUMBER NULL, + SEQUENCE_ID NUMBER NULL, + SCHEME_ID NUMBER NULL, + PARENT_JOB NUMBER NULL, + IS_KEY NUMBER NULL, + WORKPLACE NVARCHAR2(100) NULL, + DESCRIPTION NVARCHAR2(1000) NULL, + WORK_DUTY NVARCHAR2(1000) NULL, + WORK_AUTHORITY NVARCHAR2(1000) NULL, + FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_JOB_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_JOBDT +CREATE TABLE JCL_ORG_JOBDT ( + ID NUMBER NOT NULL, + MAINID NUMBER NULL, + LEVEL_ID NVARCHAR2(100) NULL, + GRADE_ID NVARCHAR2(100) NULL, + LEVEL_ID_SPAN NVARCHAR2(1000) NULL, + GRADE_ID_SPAN NVARCHAR2(1000) NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_JOBDT_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_JOBEXT +CREATE TABLE JCL_ORG_JOBEXT ( + ID NUMBER NOT NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_JOBEXT_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_JOBEXT_DT1 +CREATE TABLE JCL_ORG_JOBEXT_DT1 ( + ID NUMBER NOT NULL, + MAINID NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_JOBEXT_DT1_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_HRMRESOURCE +CREATE TABLE JCL_ORG_HRMRESOURCE ( + ID NUMBER NOT NULL, + WORK_CODE NVARCHAR2(60) NULL, + LOGIN_ID NVARCHAR2(60) NULL, + LAST_NAME NVARCHAR2(60) NULL, + SEX NUMBER NULL, + ACCOUNT_TYPE NUMBER NULL, + BELONG_TO NUMBER NULL, + COMPANY_ID NUMBER NULL, + DEPARTMENT_ID NUMBER NULL, + JOB_ACTIVITY NUMBER NULL, + JOB_TITLE NUMBER NULL, + JOB_CALL NUMBER NULL, + JOB_LEVEL NUMBER NULL, + JOB_GROUP_ID NUMBER NULL, + JOB_ACTIVITY_DESC NVARCHAR2(200) NULL, + STATUS NUMBER NULL, + SYSTEM_LANGUAGE NUMBER NULL, + RESOURCE_IMAGE_ID NVARCHAR2(1000) NULL, + MESSAGER_URL NVARCHAR2(1000) NULL, + LOCATION_ID NUMBER NULL, + MANAGER_ID NUMBER NULL, + ASSISTANT_ID NUMBER NULL, + MOBILE NVARCHAR2(60) NULL, + TELEPHONE NVARCHAR2(60) NULL, + MOBILE_CALL NVARCHAR2(60) NULL, + FAX NVARCHAR2(60) NULL, + EMAIL NVARCHAR2(60) NULL, + WORKROOM NVARCHAR2(60) NULL, + PASS_WORD NVARCHAR2(100) NULL, + SEC_LEVEL NUMBER NULL, + BIRTHDAY CHAR(10) NULL, + FOLK NVARCHAR2(30) NULL, + NATIVE_PLACE NVARCHAR2(100) NULL, + REG_RESIDENT_PLACE NVARCHAR2(200) NULL, + CERTIFICATE_NUM NVARCHAR2(60) NULL, + MARITAL_STATUS CHAR(1) NULL, + POLICY NVARCHAR2(30) NULL, + BE_MEMBER_DATE CHAR(10) NULL, + BE_PARTY_DATE CHAR(10) NULL, + ISLABOUUNION CHAR(1) NULL, + DEGREE NVARCHAR2(30) NULL, + HEALTH_INFO CHAR(1) NULL, + EDUCATION_LEVEL NUMBER NULL, + HEIGHT NVARCHAR2(10) NULL, + WEIGHT NUMBER NULL, + USE_KIND NUMBER NULL, + START_DATE CHAR(10) NULL, + END_DATE CHAR(10) NULL, + PROBATION_END_DATE CHAR(10) NULL, + RESIDENT_PLACE NVARCHAR2(200) NULL, + HOME_ADDRESS NVARCHAR2(100) NULL, + TEMP_RESIDENT_NUMBER NVARCHAR2(60) NULL, + COMPANY_START_DATE NVARCHAR2(10) NULL, + WORK_START_DATE NVARCHAR2(10) NULL, + ACCUM_FUND_ACCOUNT NVARCHAR2(30) NULL, + ACCOUNT_NAME NVARCHAR2(200) NULL, + BANK_ID NUMBER NULL, + ACCOUNT_ID NVARCHAR2(100) NULL, + SHOW_ORDER NUMBER NULL, + CLASSIFICATION CHAR(1) NULL, + COMPANY_WORK_YEAR DECIMAL(10,2) NULL, + WORK_YEAR DECIMAL(10,2) NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_HRMRESOURCE_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_HRMRESOURCEEXT +CREATE TABLE JCL_ORG_HRMRESOURCEEXT ( + ID NUMBER NOT NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_HRMRESOURCEEXT_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_HRMRESOURCEEXT_DT1 +CREATE TABLE JCL_ORG_HRMRESOURCEEXT_DT1 ( + ID NUMBER NOT NULL, + MAINID NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_HRMRESOURCEEXT_DT1_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_STAFFPLAN +CREATE TABLE JCL_ORG_STAFFPLAN ( + ID NUMBER NOT NULL, + PLAN_NO NVARCHAR2(100) NULL, + PLAN_NAME NVARCHAR2(100) NULL, + PLAN_YEAR NVARCHAR2(100) NULL, + TIME_START DATE NULL, + TIME_END DATE NULL, + COMPANY_ID NVARCHAR2(100) NULL, + DESCRIPTION NVARCHAR2(1000) NULL, + FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_STAFFPLAN_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_STAFF +CREATE TABLE JCL_ORG_STAFF ( + ID NUMBER NOT NULL, + PLAN_ID NUMBER NULL, + COMP_ID NUMBER NULL, + DEPT_ID NUMBER NULL, + JOB_ID NUMBER NULL, + STAFF_NUM NUMBER NULL, + CONTROL_POLICY NUMBER NULL, + PERMANENT_NUM NUMBER NULL, + FREEZE_NUM NUMBER NULL, + LACK_STATUS NUMBER NULL, + STAFF_DESC NVARCHAR2(100) NULL, + DESCRIPTION NVARCHAR2(1000) NULL, + IS_USED NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_STAFF_PK PRIMARY KEY (ID) +); + +-- JCL_ORG_STAFFS +CREATE TABLE JCL_ORG_STAFFS ( + ID NUMBER NOT NULL, + STAFF_ID NUMBER NULL, + BUSINESS_TYPE NUMBER NULL, + CHANGE_NUM NUMBER NULL, + BUSINESS_SOURCE NUMBER NULL, + REQUESTID NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_STAFFS_PK PRIMARY KEY (ID) +); + +CREATE TABLE HR_LOG ( + ID NUMBER NOT NULL, + OPERATE_DESC NVARCHAR2(100) NULL, + OPERATOR_ID NUMBER NULL, + OPERATOR_NAME NVARCHAR2(100) NULL, + CREATE_TIME DATE NULL, + OPERATE_TYPE NUMBER NULL, + PARAMS_STR NVARCHAR2(2000) NULL, + CLIENT_IP NVARCHAR2(100) NULL, + METHOD_NAME NVARCHAR2(100) NULL, + DELETE_TYPE NUMBER NULL, + CLASS_NAME NVARCHAR2(100) NULL, + OPERATE_MODULE_NAME NVARCHAR2(100) NULL, + OPERATE_MODULE NUMBER NULL, + MESSAGE NVARCHAR2(2000) NULL, + VALUE NVARCHAR2(100) NULL, + CONSTRAINT HR_LOG_PK PRIMARY KEY (ID) +); + +CREATE TABLE JCL_ORG_HRMRELATION ( + ID NUMBER NOT NULL, + SCHEME_ID NUMBER NULL, + LEVEL_ID NVARCHAR2(100) NULL, + GRADE_ID NUMBER NULL, + SEQUENCE_ID NUMBER NULL, + POST_ID NUMBER NULL, + POST_INFO_ID NUMBER NULL, + COMPANY_ID NUMBER NULL, + DEPARTMENT_ID NUMBER NULL, + JOB_ID NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_HRMRELATION_PK PRIMARY KEY (ID) +); + +CREATE TABLE JCL_ORG_MAP ( + FID NUMBER NOT NULL, + ID NUMBER NOT NULL, + FTYPE NUMBER NULL, + FOBJID NUMBER NULL, + FECID NUMBER NULL, + UUID NVARCHAR2(100) NULL, + FCLASS NUMBER NULL, + FCLASSNAME NVARCHAR2(100) NULL, + FNUMBER NVARCHAR2(100) NULL, + FNAME NVARCHAR2(255) NULL, + FLEADER NUMBER NULL, + FLEADERIMG NVARCHAR2(100) NULL, + FLEADERNAME NVARCHAR2(100) NULL, + FLEADERJOBID NUMBER NULL, + FLEADERJOB NVARCHAR2(255) NULL, + FLEADERLV NVARCHAR2(100) NULL, + FLEADERST NVARCHAR2(100) NULL, + FPARENTID NUMBER NULL, + FOBJPARENTID NUMBER NULL, + FPLAN NUMBER NULL, + FONJOB NUMBER NULL, + FISVITUAL NUMBER NULL, + FDATEBEGIN DATE NULL, + FDATEEND DATE NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_MAP_PK PRIMARY KEY (FID) +); + + +CREATE SEQUENCE JCL_ORG_SCHEME_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_SCHEME_ID_TIGGER BEFORE INSERT ON JCL_ORG_SCHEME FOR EACH ROW +BEGIN +SELECT + JCL_ORG_SCHEME_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_LEVEL_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_LEVEL_ID_TIGGER BEFORE INSERT ON JCL_ORG_LEVEL FOR EACH ROW +BEGIN +SELECT + JCL_ORG_LEVEL_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_GRADE_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_GRADE_ID_TIGGER BEFORE INSERT ON JCL_ORG_GRADE FOR EACH ROW +BEGIN +SELECT + JCL_ORG_GRADE_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_SEQUENCE_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; + +CREATE +OR REPLACE TRIGGER JCL_ORG_SEQUENCE_ID_TIGGER BEFORE INSERT ON JCL_ORG_SEQUENCE FOR EACH ROW +BEGIN +SELECT + JCL_ORG_SEQUENCE_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_POST_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_POST_ID_TIGGER BEFORE INSERT ON JCL_ORG_POST FOR EACH ROW +BEGIN +SELECT + JCL_ORG_POST_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_POST_INFO_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_POST_INFO_ID_TIGGER BEFORE INSERT ON JCL_ORG_POST_INFO FOR EACH ROW +BEGIN +SELECT + JCL_ORG_POST_INFO_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_COMP_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_COMP_ID_TIGGER BEFORE INSERT ON JCL_ORG_COMP FOR EACH ROW +BEGIN +SELECT + JCL_ORG_COMP_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_FIELD_GROUP_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_FIELD_GROUP_ID_TIGGER BEFORE INSERT ON JCL_FIELD_EXTENDGROUP FOR EACH ROW +BEGIN +SELECT + JCL_FIELD_GROUP_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_FIELD_TITLE_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_FIELD_TITLE_ID_TIGGER BEFORE INSERT ON JCL_FIELD_EXTENDTITLE FOR EACH ROW +BEGIN +SELECT + JCL_FIELD_TITLE_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_FIELD_INFO_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_FIELD_INFO_ID_TIGGER BEFORE INSERT ON JCL_FIELD_EXTENDINFO FOR EACH ROW +BEGIN +SELECT + JCL_FIELD_INFO_ID.nextval INTO:new.ID +FROM + dual; +END; + + +CREATE SEQUENCE JCL_ORG_COMPEXT_DT1_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_COMPEXT_DT1_ID_TIGGER BEFORE INSERT ON JCL_ORG_COMPEXT_DT1 FOR EACH ROW +BEGIN +SELECT + JCL_ORG_COMPEXT_DT1_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_DEPT_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_DEPT_ID_TIGGER BEFORE INSERT ON JCL_ORG_DEPT FOR EACH ROW +BEGIN +SELECT + JCL_ORG_DEPT_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_DEPTEXT_DT1_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_DEPTEXT_DT1_ID_TIGGER BEFORE INSERT ON JCL_ORG_DEPTEXT_DT1 FOR EACH ROW +BEGIN +SELECT + JCL_ORG_DEPTEXT_DT1_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_JOB_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_JOB_ID_TIGGER BEFORE INSERT ON JCL_ORG_JOB FOR EACH ROW +BEGIN +SELECT + JCL_ORG_JOB_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_JOBDT_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_JOBDT_ID_TIGGER BEFORE INSERT ON JCL_ORG_JOBDT FOR EACH ROW +BEGIN +SELECT + JCL_ORG_JOBDT_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_JOBEXT_DT1_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_JOBEXT_DT1_ID_TIGGER BEFORE INSERT ON JCL_ORG_JOBEXT_DT1 FOR EACH ROW +BEGIN +SELECT + JCL_ORG_JOBEXT_DT1_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_HRMRESOURCE_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_HRMRESOURCE_ID_TIGGER BEFORE INSERT ON JCL_ORG_HRMRESOURCE FOR EACH ROW +BEGIN +SELECT + JCL_ORG_HRMRESOURCE_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_HRMRESOURCEEXT_DT1_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_HRMRESOURCEEXT_DT1_ID_TIGGER BEFORE INSERT ON JCL_ORG_HRMRESOURCEEXT_DT1 FOR EACH ROW +BEGIN +SELECT + JCL_ORG_HRMRESOURCEEXT_DT1_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_STAFFPLAN_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_STAFFPLAN_ID_TIGGER BEFORE INSERT ON JCL_ORG_STAFFPLAN FOR EACH ROW +BEGIN +SELECT + JCL_ORG_STAFFPLAN_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_STAFF_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_STAFF_ID_TIGGER BEFORE INSERT ON JCL_ORG_STAFF FOR EACH ROW +BEGIN +SELECT + JCL_ORG_STAFF_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_STAFFS_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_STAFFS_ID_TIGGER BEFORE INSERT ON JCL_ORG_STAFFS FOR EACH ROW +BEGIN +SELECT + JCL_ORG_STAFFS_ID.nextval INTO:new.ID +FROM + dual; +END; + +CREATE SEQUENCE JCL_ORG_MAP_FID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER JCL_ORG_MAP_FID_TIGGER BEFORE INSERT ON JCL_ORG_MAP FOR EACH ROW +BEGIN +SELECT + JCL_ORG_MAP_FID.nextval INTO:new.FID +FROM + dual; +END; + +CREATE SEQUENCE HR_LOG_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE; +CREATE +OR REPLACE TRIGGER HR_LOG_ID_TIGGER BEFORE INSERT ON HR_LOG FOR EACH ROW +BEGIN +SELECT + HR_LOG_ID.nextval INTO:new.ID +FROM + dual; +END; \ No newline at end of file diff --git a/docs/脚本/SqlServer/系统人员信息改造.sql b/docs/脚本/SqlServer/系统人员信息改造.sql index bdab3431..fe376269 100644 --- a/docs/脚本/SqlServer/系统人员信息改造.sql +++ b/docs/脚本/SqlServer/系统人员信息改造.sql @@ -19,8 +19,10 @@ go create view v_jcl_post as select id*-1 fid,post_name fname,0 fparentid from JCL_ORG_POST +where isnull(delete_type,0)<>1 union select id,post_info_name,post_id*-1 from JCL_ORG_POST_INFO +where isnull(forbidden_tag,0)<>1 and isnull(delete_type,0)<>1 go @@ -344,8 +346,7 @@ GO update hrm_formfield set isuse=1,ismand=1,allowhide=-1 where fieldname='sex' update hrm_formfield set isuse=1,ismand=0,allowhide=-1 where fieldname='departmentid' update hrm_formfield set isuse=1,ismand=0,allowhide=-1 where fieldname='jobtitle' -update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobactivity' -update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='status' +update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobactivity' update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='joblevel' update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobcall' update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobGroupId' @@ -354,111 +355,3 @@ update hrm_formfield set isuse=1,ismand=0,allowhide=1,groupid=1,fieldorder=18 wh update hrm_formfield set isuse=1,ismand=0,allowhide=1,groupid=1,fieldorder=99 where fieldname='systemlanguage' update hrm_formfield set isuse=1,ismand=0,allowhide=1,groupid=1,fieldorder=21 where fieldname='assistantid' GO - - - -create trigger cus_fielddata_jcl on cus_fielddata after update,insert as - - declare @empid int - declare @str varchar(200) - declare @wz int - declare @zdid int - declare @zdzjid int - declare @gwid int - declare @bmid int - declare @gsid int - declare @ecgwid int - declare @ecbmid int - declare @ecgsid int - declare @zwid int - declare @zwlxid int - declare @uuid varchar(100) - declare @name varchar(200) - - if update(field100001) - begin - select @str=isnull(field100001,''),@empid=id from inserted - set @wz=charindex('_',@str) - - if not exists(select 1 from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=@empid) - begin - insert into cus_fielddata(scope, scopeid, id) values ('HrmCustomFieldByInfoType',3,@empid) - end - - if @wz>0 - begin - set @zdid=cast(right(@str,len(@str)-@wz) as int) - - - select @zdzjid=scheme_id,@name=level_name from JCL_ORG_LEVEL where id =@zdid - update cus_fielddata set field100008=@name where scope='HrmCustomFieldByInfoType' and id=@empid and scopeid=3 - - - select @name=scheme_name from JCL_ORG_SCHEME where id=@zdzjid - update cus_fielddata set field100006=@name where scope='HrmCustomFieldByInfoType' and id=@empid and scopeid=3 - - - select @name=grade_name from jcl_org_grade where ','+level_id+',' like '%,'+cast(@zdid as varchar(20))+',%' - update cus_fielddata set field100007=@name where scope='HrmCustomFieldByInfoType' and id=@empid and scopeid=3 - - - select @name=sequence_name from jcl_org_sequence where scheme_id=@zdzjid - update cus_fielddata set field100005=@name where scope='HrmCustomFieldByInfoType' and id=@empid - end - end - - if update(field100002) - - begin - select @str=isnull(field100002,''),@empid=id from inserted - set @wz=charindex('_',@str) - - if @wz>0 - begin - set @gwid=cast(right(@str,len(@str)-@wz) as int) - select @name=job_name,@bmid=parent_dept,@gsid=parent_comp from JCL_ORG_JOB where id=@gwid - - - select @ecgwid=max(id) from HrmJobTitles where jobtitlename=@name - update hrmresource set jobtitle=@ecgwid where id=@empid - - - select @uuid=uuid from JCL_ORG_DEPT where id=@bmid - select @ecbmid=id from HrmDepartment where uuid=@uuid - update hrmresource set departmentid=@ecbmid where id=@empid - - - select @uuid=uuid from JCL_ORG_COMP where id=@gsid - select @ecgsid=id from HrmSubCompany where uuid=@uuid - update hrmresource set subcompanyid1=@ecgsid where id=@empid - end - - end - - if update(field100003) - - begin - select @str=isnull(field100003,''),@empid=id from inserted - set @wz=charindex('_',@str) - - if not exists(select 1 from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=@empid) - begin - insert into cus_fielddata(scope, scopeid, id) values ('HrmCustomFieldByInfoType',3,@empid) - end - - if @wz>0 - begin - set @zwid=cast(right(@str,len(@str)-@wz) as int) - - - select @name=post_info_name,@zwlxid=post_id from jcl_org_post_info where id=@zwid - update cus_fielddata set field100010=@name where scope='HrmCustomFieldByInfoType' and id=@empid and scopeid=3 - - - select @name=post_name from jcl_org_post where id=@zwlxid - update cus_fielddata set field100009=@name where scope='HrmCustomFieldByInfoType' and id=@empid and scopeid=3 - - end - - end -GO diff --git a/docs/脚本/SqlServer/组织架构图触发器.sql b/docs/脚本/SqlServer/组织架构图触发器.sql index b1aa912d..4f3312be 100644 --- a/docs/脚本/SqlServer/组织架构图触发器.sql +++ b/docs/脚本/SqlServer/组织架构图触发器.sql @@ -87,7 +87,6 @@ create trigger HrmCompany_ed on HrmCompany after update as update jcl_org_map set fdateend=dateadd(day,-1,@fdatebegin) where fobjid=0 and fdateend>@fdatebegin - SET IDENTITY_INSERT JCL_ORG_MAP ON insert into jcl_org_map (id,ftype,fobjid,fecid,Uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -96,8 +95,6 @@ create trigger HrmCompany_ed on HrmCompany after update as (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - SET IDENTITY_INSERT JCL_ORG_MAP OFF - end go @@ -185,7 +182,6 @@ create trigger JCL_ORG_COMP_ed on JCL_ORG_COMP after update,insert as if @delete=0 begin - SET IDENTITY_INSERT JCL_ORG_MAP ON insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -194,27 +190,35 @@ create trigger JCL_ORG_COMP_ed on JCL_ORG_COMP after update,insert as (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - SET IDENTITY_INSERT JCL_ORG_MAP OFF end SET NOCOUNT OFF end go -create trigger JCL_ORG_COMP_del on JCL_ORG_COMP after delete as +create trigger JCL_ORG_COMP_del on JCL_ORG_COMP after update as + if update(delete_type) + begin + + declare @deletetype int + declare @ftype int + declare @fobjid int + declare @fdatebegin date - declare @ftype int - declare @fobjid int - declare @fdatebegin date + set @ftype=1 + select @fobjid=id from deleted + select @fdatebegin=cast(GETDATE() as date) - set @ftype=1 - select @fobjid=id from deleted - select @fdatebegin=cast(GETDATE() as date) + select @deletetype=isnull(delete_type,0) from inserted - delete from jcl_org_map where ftype=1 and fobjid=@fobjid and fdatebegin=@fdatebegin + if @deletetype=1 + begin + delete from jcl_org_map where ftype=1 and fobjid=@fobjid and fdatebegin=@fdatebegin - update jcl_org_map set fdateend=dateadd(day,-1,@fdatebegin) - where ftype=1 and fobjid=@fobjid and fdateend>@fdatebegin + update jcl_org_map set fdateend=dateadd(day,-1,@fdatebegin) + where ftype=1 and fobjid=@fobjid and fdateend>@fdatebegin + end + end go @@ -308,7 +312,6 @@ create trigger JCL_ORG_dept_ed on JCL_ORG_dept after update,insert as if @delete=0 begin - SET IDENTITY_INSERT JCL_ORG_MAP ON insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -317,27 +320,32 @@ create trigger JCL_ORG_dept_ed on JCL_ORG_dept after update,insert as (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - SET IDENTITY_INSERT JCL_ORG_MAP OFF end SET NOCOUNT OFF end go -create trigger JCL_ORG_dept_del on JCL_ORG_dept after delete as - - declare @ftype int - declare @fobjid int - declare @fdatebegin date - - set @ftype=2 - select @fobjid=id from deleted - select @fdatebegin=cast(GETDATE() as date) - - delete from jcl_org_map where ftype=@ftype and fobjid=@fobjid and fdatebegin=@fdatebegin - - - update jcl_org_map set fdateend=dateadd(day,-1,@fdatebegin) - where ftype=@ftype and fobjid=@fobjid and fdateend>@fdatebegin +create trigger JCL_ORG_dept_del on JCL_ORG_dept after update as +if update(delete_type) + begin + declare @deletetype int + declare @ftype int + declare @fobjid int + declare @fdatebegin date + + set @ftype=2 + select @fobjid=id from deleted + select @fdatebegin=cast(GETDATE() as date) + select @deletetype=isnull(delete_type,0) from inserted + if @deletetype=1 + begin + delete from jcl_org_map where ftype=@ftype and fobjid=@fobjid and fdatebegin=@fdatebegin + + + update jcl_org_map set fdateend=dateadd(day,-1,@fdatebegin) + where ftype=@ftype and fobjid=@fobjid and fdateend>@fdatebegin + end + end go @@ -422,7 +430,6 @@ create trigger JCL_ORG_job_ed on JCL_ORG_job after update,insert as if @delete=0 begin - SET IDENTITY_INSERT JCL_ORG_MAP ON insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -431,27 +438,32 @@ create trigger JCL_ORG_job_ed on JCL_ORG_job after update,insert as (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - SET IDENTITY_INSERT JCL_ORG_MAP OFF end SET NOCOUNT OFF end go -create trigger JCL_ORG_job_del on JCL_ORG_job after delete as - - declare @ftype int - declare @fobjid int - declare @fdatebegin date - - set @ftype=3 - select @fobjid=id from deleted - select @fdatebegin=cast(GETDATE() as date) - - delete from jcl_org_map where ftype=@ftype and fobjid=@fobjid and fdatebegin=@fdatebegin - - - update jcl_org_map set fdateend=dateadd(day,-1,@fdatebegin) - where ftype=@ftype and fobjid=@fobjid and fdateend>@fdatebegin +create trigger JCL_ORG_job_del on JCL_ORG_job after update as +if update(delete_type) + begin + declare @deletetype int + declare @ftype int + declare @fobjid int + declare @fdatebegin date + + set @ftype=3 + select @fobjid=id from deleted + select @fdatebegin=cast(GETDATE() as date) + select @deletetype=isnull(delete_type,0) from inserted + if @deletetype=1 + begin + delete from jcl_org_map where ftype=@ftype and fobjid=@fobjid and fdatebegin=@fdatebegin + + + update jcl_org_map set fdateend=dateadd(day,-1,@fdatebegin) + where ftype=@ftype and fobjid=@fobjid and fdateend>@fdatebegin + end + end go @@ -546,7 +558,6 @@ create trigger hrmresource_ed on hrmresource after update,insert as if @delete=0 begin - SET IDENTITY_INSERT JCL_ORG_MAP ON insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -555,7 +566,6 @@ create trigger hrmresource_ed on hrmresource after update,insert as (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - SET IDENTITY_INSERT JCL_ORG_MAP OFF end end go @@ -650,7 +660,6 @@ create trigger cus_fielddata_jclgw on cus_fielddata after update as if @delete=0 begin - SET IDENTITY_INSERT JCL_ORG_MAP ON insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -659,13 +668,11 @@ create trigger cus_fielddata_jclgw on cus_fielddata after update as (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - SET IDENTITY_INSERT JCL_ORG_MAP OFF end end go -SET IDENTITY_INSERT JCL_ORG_MAP ON insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -686,11 +693,9 @@ left join (select subcompanyid1,count(1) fcnt from hrmresource where status<=3 g on f.subcompanyid1=b.id left join cus_fielddata g on c.id=g.id and g.scope='HrmCustomFieldByInfoType' and g.scopeid=3 where isnull(a.delete_type,0) <>1 and isnull(a.forbidden_tag,0) <>1 -SET IDENTITY_INSERT JCL_ORG_MAP OFF go -SET IDENTITY_INSERT JCL_ORG_MAP ON insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -713,11 +718,9 @@ left join (select dept_id,sum(isnull(staff_num,0)) fcnt from JCL_ORG_STAFF left join (select departmentid,count(1) fcnt from hrmresource where status<=3 group by departmentid) f on f.departmentid=b.id left join cus_fielddata g on c.id=g.id and g.scope='HrmCustomFieldByInfoType' and g.scopeid=3 where isnull(a.delete_type,0) <>1 and isnull(a.forbidden_tag,0) <>1 -SET IDENTITY_INSERT JCL_ORG_MAP OFF go -SET IDENTITY_INSERT JCL_ORG_MAP ON insert into jcl_org_map (id,ftype,fobjid,fclass,fclassname,fnumber,fname, fparentid,fobjparentid, @@ -739,13 +742,11 @@ inner join jcl_org_dept d on a.uuid=b.uuid group by d.id,b.jobtitlename) f on f.id=a.parent_dept and a.job_name=f.jobtitlename where isnull(a.delete_type,0) <>1 and isnull(a.forbidden_tag,0) <>1 and a.id>=10 -SET IDENTITY_INSERT JCL_ORG_MAP OFF go delete from cus_fielddata where scopeid=-1 go -SET IDENTITY_INSERT JCL_ORG_MAP ON insert into cus_fielddata(scope, scopeid, id, field100002) select 'HrmCustomFieldByInfoType',-1,a.id,'199_'+cast(e.id as varchar(10)) from hrmresource a @@ -753,11 +754,9 @@ left join HrmJobTitles b on a.jobtitle=b.id left join hrmdepartment c on a.departmentid=c.id left join JCL_ORG_DEPT d on c.uuid=d.uuid left join jcl_org_job e on d.id=e.parent_dept and e.job_name=b.jobtitlename -SET IDENTITY_INSERT JCL_ORG_MAP OFF go -SET IDENTITY_INSERT JCL_ORG_MAP ON insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleaderimg, fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -771,5 +770,4 @@ from hrmresource a left join hrmjobtitles b on a.jobtitle=b.id left join cus_fielddata c on a.id=c.id and c.scope='HrmCustomFieldByInfoType' and c.scopeid=-1 where a.status<4 -SET IDENTITY_INSERT JCL_ORG_MAP OFF GO \ No newline at end of file diff --git a/docs/脚本/SqlServer/表结构、基础数据.sql b/docs/脚本/SqlServer/表结构、基础数据.sql index 4766537b..4f829154 100644 --- a/docs/脚本/SqlServer/表结构、基础数据.sql +++ b/docs/脚本/SqlServer/表结构、基础数据.sql @@ -716,7 +716,8 @@ IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JC GO CREATE TABLE [dbo].[JCL_ORG_MAP] ( - [id] int IDENTITY(1,1) NOT NULL, + [fid] int IDENTITY(1,1) NOT NULL, + [id] int NULL, [ftype] int NULL, [fobjid] int NULL, [fecid] int NULL, @@ -726,7 +727,7 @@ CREATE TABLE [dbo].[JCL_ORG_MAP] ( [fnumber] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [fname] varchar(255) COLLATE Chinese_PRC_CI_AS NULL, [fleader] int NULL, - [fleaderimg] int NULL, + [fleaderimg] varchar(255) COLLATE Chinese_PRC_CI_AS NULL, [fleadername] varchar(255) COLLATE Chinese_PRC_CI_AS NULL, [fleaderjobid] int NULL, [fleaderjob] varchar(255) COLLATE Chinese_PRC_CI_AS NULL, @@ -975,7 +976,7 @@ GO -ALTER TABLE [dbo].[JCL_ORG_MAP] ADD CONSTRAINT [JCL_ORG_MAP_PK] PRIMARY KEY CLUSTERED ([id]) +ALTER TABLE [dbo].[JCL_ORG_MAP] ADD CONSTRAINT [JCL_ORG_MAP_PK] PRIMARY KEY CLUSTERED ([fid]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] GO @@ -1040,9 +1041,9 @@ insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (25, 3, 'JCL_ORG_JOB', 'work_duty', '任职职责', 'text', 2, 6, 1, 0, 1, 1, 1, 0, 1, 2, 1, 0, GETDATE(), NULL, NULL, NULL, 0) insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (26, 3, 'JCL_ORG_JOB', 'ec_department', '所属部门', 'int', 3, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, GETDATE(), NULL, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0) insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (27, 3, 'JCL_ORG_JOB', 'work_authority', '工作权限', 'text', 2, 6, 1, 0, 1, 1, 1, 0, 1, 3, 1, 0, GETDATE(), NULL, NULL, NULL, 0) -insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (28, 3, 'JCL_ORG_JOB', 'level_id', '职等', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 3, 1, 0, GETDATE(), NULL, '162', '["browser",{"valueSpan":"自定义多选","replaceDatas":[{"itemorderid":"162","name":"自定义多选","id":"162","parenttitle":"集成","title":"集成-自定义多选"}],"value":"162"},{"valueSpan":"职等浏览按钮","replaceDatas":[{"showname":"LevelBrowser","name":"职等浏览按钮","id":"LevelBrowser"}],"value":"LevelBrowser"}]', 0) +insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (28, 3, 'JCL_ORG_JOB', 'level_id', '职等', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 4, 1, 0, GETDATE(), NULL, '162', '["browser",{"valueSpan":"自定义多选","replaceDatas":[{"itemorderid":"162","name":"自定义多选","id":"162","parenttitle":"集成","title":"集成-自定义多选"}],"value":"162"},{"valueSpan":"职等浏览按钮","replaceDatas":[{"showname":"LevelBrowser","name":"职等浏览按钮","id":"LevelBrowser"}],"value":"LevelBrowser"}]', 0) insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 4, 1, 0, GETDATE(), NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0) -insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (30, 3, 'JCL_ORG_JOB', 'grade_id', '职级', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 4, 1, 0, GETDATE(), NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"itemorderid":"161","name":"自定义单选","id":"161","parenttitle":"集成","title":"集成-自定义单选"}],"value":"161"},{"valueSpan":"职级浏览按钮","replaceDatas":[{"showname":"gradeBrowser","name":"职级浏览按钮","id":"gradeBrowser"}],"value":"gradeBrowser"}]', 0) +insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (30, 3, 'JCL_ORG_JOB', 'grade_id', '职级', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 3, 1, 0, GETDATE(), NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"itemorderid":"161","name":"自定义单选","id":"161","parenttitle":"集成","title":"集成-自定义单选"}],"value":"161"},{"valueSpan":"职级浏览按钮","replaceDatas":[{"showname":"gradeBrowser","name":"职级浏览按钮","id":"gradeBrowser"}],"value":"gradeBrowser"}]', 0) insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (31, 3, 'JCL_ORG_JOB', 'parent_job', '上级岗位', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, GETDATE(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"jobBrowser","valueSpan":"岗位浏览按钮","replaceDatas":[{"showname":"jobBrowser","shownamespan":"jobBrowser","namespan":"岗位浏览按钮","name":"岗位浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"jobBrowser","id":"jobBrowser"}]}]', 0) insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (32, 3, 'JCL_ORG_JOB', 'is_key', '是否关键岗', 'int', 5, 3, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, GETDATE(), NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"否"},{"default":"","unuse":"0","id":"1","key":"1","option":"是"}],"sort":"horizontal"}]', 0) insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (33, 3, 'JCL_ORG_JOB', 'workplace', '工作地点', 'varchar(100)', 1, 3, 1, 0, 1, 1, 1, 0, 1, 7, 1, 0, GETDATE(), NULL, '1', '["input","text","100"]', 0) diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 26fc2f4b..3625d09c 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -1,5 +1,6 @@ package com.engine.organization.service.impl; +import com.alibaba.fastjson.JSONObject; import com.api.browser.bean.BrowserBean; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; @@ -8,6 +9,7 @@ import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.DeleteParam; +import com.engine.organization.entity.browser.po.CustomBrowserBean; import com.engine.organization.entity.staff.bo.StaffBO; import com.engine.organization.entity.staff.param.StaffSearchParam; import com.engine.organization.entity.staff.po.StaffPO; @@ -189,8 +191,15 @@ public class StaffServiceImpl extends Service implements StaffService { SearchConditionItem deptIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "部门", "161", "deptId", "deptBrowser"); deptIdItem.setRules("required|string"); // 岗位 - SearchConditionItem jobIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "岗位", "161", "jobId", "jobBrowser"); + SearchConditionItem jobIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "岗位", "666", "jobId", ""); jobIdItem.setRules("required|string"); + BrowserBean browserBean = jobIdItem.getBrowserConditionParam(); + String s = JSONObject.toJSONString(browserBean); + CustomBrowserBean customBrowserBean = JSONObject.parseObject(s, CustomBrowserBean.class); + customBrowserBean.setHasLeftTree(true); + customBrowserBean.setLeftToSearchKey("treeKey"); + jobIdItem.setBrowserConditionParam(customBrowserBean); + // 编制数 SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "编制数", "staffNum"); staffNumItem.setRules("required"); diff --git a/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java b/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java index d0953149..73786857 100644 --- a/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java +++ b/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java @@ -9,6 +9,7 @@ import com.engine.organization.entity.postion.po.PostPO; import com.engine.organization.entity.scheme.po.GradePO; import com.engine.organization.entity.scheme.po.LevelPO; import com.engine.organization.entity.scheme.po.SchemePO; +import com.engine.organization.entity.sequence.po.SequencePO; import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.mapper.job.JobMapper; @@ -32,6 +33,9 @@ public class CusFieldDataTrigger { public static void run(Long id) { + if (null == id) { + return; + } boolean updateFlag = false; // 查询当前操作的数据 CusFieldData sourceData = MapperProxyFactory.getProxy(SystemDataMapper.class).getHrmCusFieldDataByIdAndScopeId(id, -1L); @@ -46,6 +50,9 @@ public class CusFieldDataTrigger { directionData.setScope("HrmCustomFieldByInfoType"); directionData.setScopeId(3L); directionData.setId(id); + directionData.setField100001(sourceField100001); + directionData.setField100002(sourceField100002); + directionData.setField100003(sourceField100003); MapperProxyFactory.getProxy(SystemDataMapper.class).insertCusFieldData(directionData); } @@ -66,6 +73,8 @@ public class CusFieldDataTrigger { GradePO gradeByLevelId = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByLevelId(zdId); directionData.setField100007(gradeByLevelId.getGradeName()); MapperProxyFactory.getProxy(SequenceMapper.class).getSequenceBySchemeId(schemeByID.getId()); + SequencePO sequenceBySchemeId = MapperProxyFactory.getProxy(SequenceMapper.class).getSequenceBySchemeId(levelByID.getSchemeId()); + directionData.setField100005(sequenceBySchemeId.getSequenceName()); updateFlag = true; }