diff --git a/docs/0829/Mysql.sql b/docs/0829/Mysql.sql index a859b7b6..2d975372 100644 --- a/docs/0829/Mysql.sql +++ b/docs/0829/Mysql.sql @@ -35,3 +35,5 @@ DROP TRIGGER IF EXISTS JCL_ORG_job_ed; DROP TRIGGER IF EXISTS JCL_ORG_job_del; DROP TRIGGER IF EXISTS hrmresource_ed; DROP TRIGGER IF EXISTS cus_fielddata_jclgw; + +update WORKFLOW_BROWSERURL set TYPEID = 2 where id ='666'; \ No newline at end of file diff --git a/docs/0829/Oracle.sql b/docs/0829/Oracle.sql index 7a13b4fd..adc3ca26 100644 --- a/docs/0829/Oracle.sql +++ b/docs/0829/Oracle.sql @@ -122,4 +122,7 @@ if V_NUM > 0 then execute immediate 'DROP TRIGGER cus_fielddata_jclgw'; end if; END; +/ + +update WORKFLOW_BROWSERURL set TYPEID = 2 where id ='666' / \ No newline at end of file diff --git a/docs/0829/SqlServer.sql b/docs/0829/SqlServer.sql index 7b161090..e10e587a 100644 --- a/docs/0829/SqlServer.sql +++ b/docs/0829/SqlServer.sql @@ -1,5 +1,7 @@ alter table JCL_ORG_STAFFS add description varchar(200) GO +update WORKFLOW_BROWSERURL set TYPEID = 2 where id ='666' +GO IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_ITEMCLASS]') AND type IN ('U')) DROP TABLE [dbo].[JCL_ORG_ITEMCLASS] @@ -50,30 +52,3 @@ ALTER TABLE [dbo].[JCL_ORG_ITEM] ADD CONSTRAINT [JCL_ORG_ITEM_PK] PRIMARY KEY CL GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[HrmCompany_ed]') AND type IN ('TR')) -DROP TRIGGER [dbo].[HrmCompany_ed] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_COMP_ed]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_COMP_ed] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_COMP_del]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_COMP_del] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_dept_ed]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_dept_ed] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_dept_del]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_dept_del] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_job_ed]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_job_ed] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_job_del]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_job_del] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[hrmresource_ed]') AND type IN ('TR')) -DROP TRIGGER [dbo].[hrmresource_ed] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[cus_fielddata_jclgw]') AND type IN ('TR')) -DROP TRIGGER [dbo].[cus_fielddata_jclgw] -GO \ No newline at end of file diff --git a/docs/1017/Mysql.sql b/docs/1017/Mysql.sql new file mode 100644 index 00000000..1076007e --- /dev/null +++ b/docs/1017/Mysql.sql @@ -0,0 +1,101 @@ +DROP TABLE IF EXISTS `jcl_org_item`; +CREATE TABLE `jcl_org_item` ( + `fid` int(11) NOT NULL AUTO_INCREMENT, + `fclassid` int(11) NOT NULL, + `fno` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `fname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `fmemo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `fdelete` int(11) NOT NULL, + `creator` int(11) NULL DEFAULT NULL, + `create_time` date NULL DEFAULT NULL, + `update_time` date NULL DEFAULT NULL, + PRIMARY KEY (`fid`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; + + +DROP TABLE IF EXISTS `jcl_org_itemclass`; +CREATE TABLE `jcl_org_itemclass` ( + `fid` int(11) NOT NULL AUTO_INCREMENT, + `fno` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `fname` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `fmemo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `creator` int(11) NULL DEFAULT NULL, + `create_time` date NULL DEFAULT NULL, + `update_time` date NULL DEFAULT NULL, + PRIMARY KEY (`fid`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; + +delete from jcl_org_job where id not in ( select id from ( select max(id) as id from jcl_org_job group by parent_comp , parent_dept, parent_job, job_name) c); +delete from jcl_field_extendinfo where extend_type =4; + +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'work_code', '编号', 'varchar(60)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 1, 1, 0, now(), now(), '1', '["input","text","60"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'last_name', '姓名', 'varchar(60)', 1, 4, 1, 1, 1, NULL, 1, 1, 1, 2, 1, 0, now(), now(), '1', '["input","text","60"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'sex', '性别', 'int', 5, 4, 1, 1, 1, NULL, 1, 1, 1, 3, 1, 0, now(), now(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"男"},{"default":"","unuse":"","id":"1","key":"1","option":"女"}],"sort":"horizontal"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'status', '状态', 'int', 5, 4, 1, 1, 1, NULL, 1, 1, 1, 4, 1, 0, now(), now(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"试用"},{"default":"","unuse":"","id":"1","key":"1","option":"正式"},{"default":"","unuse":"","id":"2","key":"2","option":"临时"},{"default":"","unuse":"","id":"3","key":"3","option":"试用延期"},{"default":"","unuse":"","id":"4","key":"4","option":"解聘"},{"default":"","unuse":"","id":"5","key":"5","option":"离职"},{"default":"","unuse":"","id":"6","key":"6","option":"退休"},{"default":"","unuse":"","id":"7","key":"7","option":"无效"},{"default":"","unuse":"","id":"8","key":"8","option":"在职"}],"sort":"horizontal"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'account_type', '账号类型', 'int', 5, 4, 1, 1, 1, NULL, 1, 1, 1, 5, 1, 0, now(), now(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"主账号"},{"default":"","unuse":"","id":"1","key":"1","option":"次账号"}],"sort":"horizontal"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'belong_to', '主账号', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 6, 1, 0, now(), now(), '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_title', '岗位', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 7, 1, 0, now(), now(), '666', '["browser",{"valueSpan":"聚才林岗位","replaceDatas":[{"name":"聚才林岗位","id":"666"}],"value":"666"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_level', '职级', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 8, 1, 0, now(), now(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职级浏览按钮","value":"gradeBrowser"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_group_id', '职务类别', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 9, 1, 0, now(), now(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务分类浏览按钮","value":"postBrowser"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_activity', '职务', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 10, 1, 0, now(), now(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务信息浏览按钮","value":"PostInfoBrowser"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'location_id', '办公地点', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 11, 1, 0, now(), now(), '262', '["browser",{"valueSpan":"办公地点","replaceDatas":[{"name":"办公地点","id":"262"}],"value":"262"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'show_order', '显示顺序', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 12, 1, 0, now(), now(), '2', '["input","int"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'ec_company', '分部', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 13, 1, 0, now(), now(), '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'ec_department', '部门', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 14, 1, 0, now(), now(), '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'company_start_date', '入职日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 15, 1, 0, now(), now(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'work_start_date', '参加工作日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 16, 1, 0, now(), now(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_activity_desc', '职责描述', 'varchar(200)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 17, 1, 0, now(), now(), '1', '["input","text","200"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'department_id', '部门', 'int', 3, 4, 0, 0, 0, NULL, 0, 0, 1, 18, 1, 0, now(), now(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","value":"deptBrowser"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'login_id', '登录名', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 19, 1, 0, now(), now(), '1', '["input","text","60"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_call', '职称', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 20, 1, 0, now(), now(), '260', '["browser",{"valueSpan":"职称","replaceDatas":[{"name":"职称","id":"260"}],"value":"260"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'system_language', '系统语言', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 21, 1, 0, now(), now(), '259', '["browser",{"valueSpan":"语言","replaceDatas":[{"name":"语言","id":"259"}],"value":"259"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'resource_image_id', '照片', 'varchar(1000)', 6, 4, 1, 0, 1, NULL, 1, 1, 1, 22, 1, 0, now(), now(), '1', '["upload","file"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'messager_url', '头像', 'varchar(1000)', 6, 4, 0, 0, 1, NULL, 1, 1, 1, 23, 1, 0, now(), now(), '1', '["upload","file"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'company_id', '分部', 'int', 3, 4, 0, 0, 0, NULL, 0, 0, 1, 24, 1, 0, now(), now(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"公司分部浏览按钮","value":"compBrowser"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'pass_word', '密码', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 25, 1, 0, now(), now(), '1', '["input","text","100"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'sec_level', '安全级别', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 26, 1, 0, now(), now(), '2', '["input","int"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'birthday', '出生日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 27, 1, 0, now(), now(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'folk', '民族', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 28, 1, 0, now(), now(), '1', '["input","text","30"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'native_place', '籍贯', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 29, 1, 0, now(), now(), '1', '["input","text","100"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'reg_resident_place', '户口', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 30, 1, 0, now(), now(), '1', '["input","text","200"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'certificate_num', '身份证号码', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 31, 1, 0, now(), now(), '1', '["input","text","60"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'marital_status', '婚姻状况', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 32, 1, 0, now(), now(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"未婚"},{"default":"","unuse":"","id":"1","key":"1","option":"已婚"},{"default":"","unuse":"","id":"2","key":"2","option":"离异"}],"sort":"horizontal"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'policy', '政治面貌', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 33, 1, 0, now(), now(), '1', '["input","text","30"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'be_member_date', '入团日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 34, 1, 0, now(), now(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'start_date', '合同开始日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 35, 1, 0, now(), now(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'be_party_date', '入党日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 36, 1, 0, now(), now(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'islabouunion', '工会会员', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 37, 1, 0, now(), now(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"是"},{"default":"","unuse":"","id":"1","key":"1","option":"否"}],"sort":"horizontal"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'education_level', '学历', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 38, 1, 0, now(), now(), '30', '["browser",{"valueSpan":"学历","replaceDatas":[{"name":"学历","id":"30"}],"value":"30"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'degree', '学位', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 39, 1, 0, now(), now(), '1', '["input","text","30"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'health_info', '健康状况', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 40, 1, 0, now(), now(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"优秀"},{"default":"","unuse":"","id":"1","key":"1","option":"良好"},{"default":"","unuse":"","id":"2","key":"2","option":"一般"},{"default":"","unuse":"","id":"3","key":"3","option":"较差"}],"sort":"horizontal"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'height', '身高', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 41, 1, 0, now(), now(), '2', '["input","int"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'weight', '体重', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 42, 1, 0, now(), now(), '2', '["input","int"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'use_kind', '用工性质', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 43, 1, 0, now(), now(), '31', '["browser",{"valueSpan":"用工性质","replaceDatas":[{"name":"用工性质","id":"31"}],"value":"31"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'end_date', '合同结束日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 44, 1, 0, now(), now(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'probation_end_date', '试用期结束日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 45, 1, 0, now(), now(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'resident_place', '现居住地', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 46, 1, 0, now(), now(), '1', '["input","text","200"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'home_address', '家庭联系方式', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 47, 1, 0, now(), now(), '1', '["input","text","100"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'temp_resident_number', '暂住证号码', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 48, 1, 0, now(), now(), '1', '["input","text","60"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'accum_fund_account', '公积金帐户', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 49, 1, 0, now(), now(), '1', '["input","text","30"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'account_name', '工资账号户名', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 50, 1, 0, now(), now(), '1', '["input","text","200"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'bank_id', '工资银行', 'varchar(400)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 51, 1, 0, now(), now(), '284', '["browser",{"valueSpan":"工资银行","replaceDatas":[{"name":"工资银行","id":"284"}],"value":"284"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'account_id', '工资账号', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 52, 1, 0, now(), now(), '1', '["input","text","100"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'classification', '人员密级', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 53, 1, 0, now(), now(), '2', '["input","int"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'work_year', '工龄', 'decimal(15,2)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 54, 1, 0, now(), now(), '3', '["input","float"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'company_work_year', '司龄', 'decimal(15,2)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 55, 1, 0, now(), now(), '3', '["input","float"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'manager_id', '直接上级', 'int', 3, 7, 0, 0, 1, NULL, 1, 1, 1, 1, 1, 0, now(), now(), '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'assistant_id', '助理', 'int', 3, 7, 0, 0, 1, NULL, 1, 1, 1, 2, 1, 0, now(), now(), '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'mobile', '移动电话', 'varchar(60)', 1, 8, 1, 1, 1, NULL, 1, 1, 1, 1, 1, 0, now(), now(), '1', '["input","text","60"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'telephone', '办公室电话', 'varchar(60)', 1, 8, 1, 0, 1, NULL, 1, 1, 1, 2, 1, 0, now(), now(), '1', '["input","text","60"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'mobile_call', '其他电话', 'varchar(60)', 1, 8, 0, 0, 1, NULL, 1, 1, 1, 3, 1, 0, now(), now(), '1', '["input","text","60"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'fax', '传真', 'varchar(60)', 1, 8, 0, 0, 1, NULL, 1, 1, 1, 4, 1, 0, now(), now(), '1', '["input","text","60"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'email', '电子邮件', 'varchar(60)', 1, 8, 1, 1, 1, NULL, 1, 1, 1, 5, 1, 0, now(), now(), '1', '["input","text","60"]', 0); +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'workroom', '办公室', 'varchar(60)', 1, 8, 0, 0, 1, NULL, 1, 1, 1, 6, 1, 0, now(), now(), '1', '["input","text","60"]', 0); + + +alter table JCL_ORG_HRMRESOURCE add ec_department int; +alter table JCL_ORG_HRMRESOURCE add ec_company int; +alter table JCL_ORG_HRMRESOURCE add uuid varchar(50); + + +insert into jcl_org_hrmresource (work_code, last_name, sex, status, account_type, belong_to, job_title, job_level, location_id, show_order, ec_company, company_id, ec_department, department_id, company_start_date, work_start_date, job_activity_desc, resource_image_id, mobile, telephone, email, uuid, delete_type) select a.workcode , a.lastname , a.sex , a.status , a.accounttype , a.belongto , c.id, c.grade_id, a.locationid , a.dsporder , a.subcompanyid1 , c.parent_comp, a.departmentid , c.parent_dept, a.companystartdate , a.workstartdate , a.jobactivitydesc , a.resourceimageid, a.mobile , a.telephone , a.email, a.uuid, 0 from hrmresource a inner join hrmjobtitles b on a.jobtitle = b.id inner join ( select * from jcl_org_job ) c on a.subcompanyid1 = c.ec_company and a.departmentid = c.ec_department and b.jobtitlename = c.job_name; \ No newline at end of file diff --git a/docs/1017/Oracle.sql b/docs/1017/Oracle.sql new file mode 100644 index 00000000..97703aaf --- /dev/null +++ b/docs/1017/Oracle.sql @@ -0,0 +1,207 @@ +begin + jcl_droptable('JCL_ORG_ITEMCLASS'); +END; +/ +CREATE TABLE JCL_ORG_ITEMCLASS ( + FID NUMBER NOT NULL, + FNO NVARCHAR2(50) NOT NULL, + FNAME NVARCHAR2 (50) NOT NULL, + FMEMO NVARCHAR2 (255) NULL , + CREATOR NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_ITEMCLASS_PK PRIMARY KEY (FID) +) +/ +BEGIN + jcl_dropsequence('JCL_ORG_ITEMCLASS_ID'); +END; +/ +CREATE SEQUENCE JCL_ORG_ITEMCLASS_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE +/ +CREATE +OR REPLACE TRIGGER JCL_ORG_ITEMCLASS_ID_TIGGER BEFORE INSERT ON JCL_ORG_ITEMCLASS FOR EACH ROW +BEGIN +SELECT + JCL_ORG_ITEMCLASS_ID.nextval INTO:new.FID +FROM + dual; +END; +/ + +begin + jcl_droptable('JCL_ORG_ITEM'); +END; +/ +CREATE TABLE JCL_ORG_ITEM ( + FID NUMBER NOT NULL, + FCLASSID NUMBER NOT NULL, + FNO NVARCHAR2(50) NOT NULL, + FNAME NVARCHAR2 (255) NOT NULL, + FMEMO NVARCHAR2 (255) NULL, + FDELETE NUMBER NOT NULL, + CREATOR NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_ITEM_PK PRIMARY KEY (FID) +) +/ +BEGIN + jcl_dropsequence('JCL_ORG_ITEM_ID'); +END; +/ +CREATE SEQUENCE JCL_ORG_ITEM_ID INCREMENT BY 1 START WITH 1 nomaxvalue minvalue 1 NOCYCLE +/ +CREATE +OR REPLACE TRIGGER JCL_ORG_ITEM_ID_TIGGER BEFORE INSERT ON JCL_ORG_ITEM FOR EACH ROW +BEGIN +SELECT + JCL_ORG_ITEM_ID.nextval INTO:new.FID +FROM + dual; +END; +/ + +delete from jcl_org_job where id not in (select max(id) from jcl_org_job group by parent_comp ,parent_dept,parent_job,job_name) +/ +delete from jcl_field_extendinfo where extend_type =4 +/ + +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'work_code', '编号', 'varchar(60)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 1, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","60"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'last_name', '姓名', 'varchar(60)', 1, 4, 1, 1, 1, NULL, 1, 1, 1, 2, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","60"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'sex', '性别', 'int', 5, 4, 1, 1, 1, NULL, 1, 1, 1, 3, 1, 0, SYSDATE, SYSDATE, '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"男"},{"default":"","unuse":"","id":"1","key":"1","option":"女"}],"sort":"horizontal"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'status', '状态', 'int', 5, 4, 1, 1, 1, NULL, 1, 1, 1, 4, 1, 0, SYSDATE, SYSDATE, '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"试用"},{"default":"","unuse":"","id":"1","key":"1","option":"正式"},{"default":"","unuse":"","id":"2","key":"2","option":"临时"},{"default":"","unuse":"","id":"3","key":"3","option":"试用延期"},{"default":"","unuse":"","id":"4","key":"4","option":"解聘"},{"default":"","unuse":"","id":"5","key":"5","option":"离职"},{"default":"","unuse":"","id":"6","key":"6","option":"退休"},{"default":"","unuse":"","id":"7","key":"7","option":"无效"},{"default":"","unuse":"","id":"8","key":"8","option":"在职"}],"sort":"horizontal"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'account_type', '账号类型', 'int', 5, 4, 1, 1, 1, NULL, 1, 1, 1, 5, 1, 0, SYSDATE, SYSDATE, '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"主账号"},{"default":"","unuse":"","id":"1","key":"1","option":"次账号"}],"sort":"horizontal"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'belong_to', '主账号', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 6, 1, 0, SYSDATE, SYSDATE, '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_title', '岗位', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 7, 1, 0, SYSDATE, SYSDATE, '666', '["browser",{"valueSpan":"聚才林岗位","replaceDatas":[{"name":"聚才林岗位","id":"666"}],"value":"666"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_level', '职级', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 8, 1, 0, SYSDATE, SYSDATE, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职级浏览按钮","value":"gradeBrowser"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_group_id', '职务类别', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 9, 1, 0, SYSDATE, SYSDATE, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务分类浏览按钮","value":"postBrowser"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_activity', '职务', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 10, 1, 0, SYSDATE, SYSDATE, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务信息浏览按钮","value":"PostInfoBrowser"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'location_id', '办公地点', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 11, 1, 0, SYSDATE, SYSDATE, '262', '["browser",{"valueSpan":"办公地点","replaceDatas":[{"name":"办公地点","id":"262"}],"value":"262"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'show_order', '显示顺序', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 12, 1, 0, SYSDATE, SYSDATE, '2', '["input","int"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'ec_company', '分部', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 13, 1, 0, SYSDATE, SYSDATE, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'ec_department', '部门', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 14, 1, 0, SYSDATE, SYSDATE, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'company_start_date', '入职日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 15, 1, 0, SYSDATE, SYSDATE, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'work_start_date', '参加工作日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 16, 1, 0, SYSDATE, SYSDATE, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_activity_desc', '职责描述', 'varchar(200)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 17, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","200"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'department_id', '部门', 'int', 3, 4, 0, 0, 0, NULL, 0, 0, 1, 18, 1, 0, SYSDATE, SYSDATE, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","value":"deptBrowser"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'login_id', '登录名', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 19, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","60"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_call', '职称', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 20, 1, 0, SYSDATE, SYSDATE, '260', '["browser",{"valueSpan":"职称","replaceDatas":[{"name":"职称","id":"260"}],"value":"260"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'system_language', '系统语言', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 21, 1, 0, SYSDATE, SYSDATE, '259', '["browser",{"valueSpan":"语言","replaceDatas":[{"name":"语言","id":"259"}],"value":"259"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'resource_image_id', '照片', 'varchar(1000)', 6, 4, 1, 0, 1, NULL, 1, 1, 1, 22, 1, 0, SYSDATE, SYSDATE, '1', '["upload","file"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'messager_url', '头像', 'varchar(1000)', 6, 4, 0, 0, 1, NULL, 1, 1, 1, 23, 1, 0, SYSDATE, SYSDATE, '1', '["upload","file"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'company_id', '分部', 'int', 3, 4, 0, 0, 0, NULL, 0, 0, 1, 24, 1, 0, SYSDATE, SYSDATE, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"公司分部浏览按钮","value":"compBrowser"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'pass_word', '密码', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 25, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","100"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'sec_level', '安全级别', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 26, 1, 0, SYSDATE, SYSDATE, '2', '["input","int"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'birthday', '出生日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 27, 1, 0, SYSDATE, SYSDATE, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'folk', '民族', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 28, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","30"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'native_place', '籍贯', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 29, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","100"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'reg_resident_place', '户口', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 30, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","200"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'certificate_num', '身份证号码', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 31, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","60"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'marital_status', '婚姻状况', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 32, 1, 0, SYSDATE, SYSDATE, '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"未婚"},{"default":"","unuse":"","id":"1","key":"1","option":"已婚"},{"default":"","unuse":"","id":"2","key":"2","option":"离异"}],"sort":"horizontal"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'policy', '政治面貌', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 33, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","30"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'be_member_date', '入团日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 34, 1, 0, SYSDATE, SYSDATE, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'start_date', '合同开始日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 35, 1, 0, SYSDATE, SYSDATE, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'be_party_date', '入党日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 36, 1, 0, SYSDATE, SYSDATE, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'islabouunion', '工会会员', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 37, 1, 0, SYSDATE, SYSDATE, '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"是"},{"default":"","unuse":"","id":"1","key":"1","option":"否"}],"sort":"horizontal"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'education_level', '学历', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 38, 1, 0, SYSDATE, SYSDATE, '30', '["browser",{"valueSpan":"学历","replaceDatas":[{"name":"学历","id":"30"}],"value":"30"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'degree', '学位', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 39, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","30"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'health_info', '健康状况', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 40, 1, 0, SYSDATE, SYSDATE, '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"优秀"},{"default":"","unuse":"","id":"1","key":"1","option":"良好"},{"default":"","unuse":"","id":"2","key":"2","option":"一般"},{"default":"","unuse":"","id":"3","key":"3","option":"较差"}],"sort":"horizontal"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'height', '身高', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 41, 1, 0, SYSDATE, SYSDATE, '2', '["input","int"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'weight', '体重', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 42, 1, 0, SYSDATE, SYSDATE, '2', '["input","int"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'use_kind', '用工性质', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 43, 1, 0, SYSDATE, SYSDATE, '31', '["browser",{"valueSpan":"用工性质","replaceDatas":[{"name":"用工性质","id":"31"}],"value":"31"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'end_date', '合同结束日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 44, 1, 0, SYSDATE, SYSDATE, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'probation_end_date', '试用期结束日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 45, 1, 0, SYSDATE, SYSDATE, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'resident_place', '现居住地', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 46, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","200"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'home_address', '家庭联系方式', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 47, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","100"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'temp_resident_number', '暂住证号码', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 48, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","60"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'accum_fund_account', '公积金帐户', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 49, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","30"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'account_name', '工资账号户名', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 50, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","200"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'bank_id', '工资银行', 'varchar(400)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 51, 1, 0, SYSDATE, SYSDATE, '284', '["browser",{"valueSpan":"工资银行","replaceDatas":[{"name":"工资银行","id":"284"}],"value":"284"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'account_id', '工资账号', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 52, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","100"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'classification', '人员密级', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 53, 1, 0, SYSDATE, SYSDATE, '2', '["input","int"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'work_year', '工龄', 'decimal(15,2)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 54, 1, 0, SYSDATE, SYSDATE, '3', '["input","float"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'company_work_year', '司龄', 'decimal(15,2)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 55, 1, 0, SYSDATE, SYSDATE, '3', '["input","float"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'manager_id', '直接上级', 'int', 3, 7, 0, 0, 1, NULL, 1, 1, 1, 1, 1, 0, SYSDATE, SYSDATE, '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'assistant_id', '助理', 'int', 3, 7, 0, 0, 1, NULL, 1, 1, 1, 2, 1, 0, SYSDATE, SYSDATE, '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'mobile', '移动电话', 'varchar(60)', 1, 8, 1, 1, 1, NULL, 1, 1, 1, 1, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","60"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'telephone', '办公室电话', 'varchar(60)', 1, 8, 1, 0, 1, NULL, 1, 1, 1, 2, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","60"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'mobile_call', '其他电话', 'varchar(60)', 1, 8, 0, 0, 1, NULL, 1, 1, 1, 3, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","60"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'fax', '传真', 'varchar(60)', 1, 8, 0, 0, 1, NULL, 1, 1, 1, 4, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","60"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'email', '电子邮件', 'varchar(60)', 1, 8, 1, 1, 1, NULL, 1, 1, 1, 5, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","60"]', 0) +/ +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'workroom', '办公室', 'varchar(60)', 1, 8, 0, 0, 1, NULL, 1, 1, 1, 6, 1, 0, SYSDATE, SYSDATE, '1', '["input","text","60"]', 0) +/ + +alter table JCL_ORG_HRMRESOURCE add ec_department int +/ +alter table JCL_ORG_HRMRESOURCE add ec_company int +/ +alter table JCL_ORG_HRMRESOURCE add uuid varchar(50) +/ + + + +insert into jcl_org_hrmresource (work_code, last_name, sex, status, account_type, belong_to, job_title, job_level, location_id, show_order, ec_company, company_id, ec_department, department_id, company_start_date, work_start_date, job_activity_desc, resource_image_id, mobile, telephone, email, uuid, delete_type) select a.workcode , a.lastname , a.sex , a.status , a.accounttype , a.belongto , c.id, c.grade_id, a.locationid , a.dsporder , a.subcompanyid1 , c.parent_comp, a.departmentid , c.parent_dept, a.companystartdate , a.workstartdate , a.jobactivitydesc , a.resourceimageid, a.mobile , a.telephone , a.email, a.uuid, 0 from hrmresource a inner join hrmjobtitles b on a.jobtitle = b.id inner join ( select * from jcl_org_job ) c on a.subcompanyid1 = c.ec_company and a.departmentid = c.ec_department and b.jobtitlename = c.job_name +/ \ No newline at end of file diff --git a/docs/1017/SqlServer.sql b/docs/1017/SqlServer.sql new file mode 100644 index 00000000..fde5a984 --- /dev/null +++ b/docs/1017/SqlServer.sql @@ -0,0 +1,129 @@ +IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_ITEMCLASS]') AND type IN ('U')) +DROP TABLE [dbo].[JCL_ORG_ITEMCLASS] +GO + +CREATE TABLE [dbo].[JCL_ORG_ITEMCLASS] ( + [fid] int IDENTITY(1,1) NOT NULL, + [fno] varchar(50) NOT NULL, + [fname] varchar(50) NOT NULL, + [fmemo] varchar(255) NULL, + [creator] int NULL, + [create_time] datetime NULL, + [update_time] datetime NULL + ) +GO + +ALTER TABLE [dbo].[JCL_ORG_ITEMCLASS] SET (LOCK_ESCALATION = TABLE) +GO + +ALTER TABLE [dbo].[JCL_ORG_ITEMCLASS] ADD CONSTRAINT [JCL_ORG_ITEMCLASS_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 + + IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_ITEM]') AND type IN ('U')) +DROP TABLE [dbo].[JCL_ORG_ITEM] +GO + +CREATE TABLE [dbo].[JCL_ORG_ITEM] ( + [fid] int IDENTITY(1,1) NOT NULL, + [fclassid] int NOT NULL, + [fno] varchar(50) NOT NULL, + [fname] varchar(255) NOT NULL, + [fmemo] varchar(255) NULL, + [fdelete] int NOT NULL, + [creator] int NULL, + [create_time] datetime NULL, + [update_time] datetime NULL + ) +GO + +ALTER TABLE [dbo].[JCL_ORG_ITEM] SET (LOCK_ESCALATION = TABLE) +GO + +ALTER TABLE [dbo].[JCL_ORG_ITEM] ADD CONSTRAINT [JCL_ORG_ITEM_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 + +delete from jcl_org_job where id not in ( select max(id) from jcl_org_job group by parent_comp , parent_dept, parent_job, job_name) +GO +delete from jcl_field_extendinfo where extend_type =4 +GO + +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'work_code', '编号', 'varchar(60)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 1, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'last_name', '姓名', 'varchar(60)', 1, 4, 1, 1, 1, NULL, 1, 1, 1, 2, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'sex', '性别', 'int', 5, 4, 1, 1, 1, NULL, 1, 1, 1, 3, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"男"},{"default":"","unuse":"","id":"1","key":"1","option":"女"}],"sort":"horizontal"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'status', '状态', 'int', 5, 4, 1, 1, 1, NULL, 1, 1, 1, 4, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"试用"},{"default":"","unuse":"","id":"1","key":"1","option":"正式"},{"default":"","unuse":"","id":"2","key":"2","option":"临时"},{"default":"","unuse":"","id":"3","key":"3","option":"试用延期"},{"default":"","unuse":"","id":"4","key":"4","option":"解聘"},{"default":"","unuse":"","id":"5","key":"5","option":"离职"},{"default":"","unuse":"","id":"6","key":"6","option":"退休"},{"default":"","unuse":"","id":"7","key":"7","option":"无效"},{"default":"","unuse":"","id":"8","key":"8","option":"在职"}],"sort":"horizontal"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'account_type', '账号类型', 'int', 5, 4, 1, 1, 1, NULL, 1, 1, 1, 5, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"主账号"},{"default":"","unuse":"","id":"1","key":"1","option":"次账号"}],"sort":"horizontal"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'belong_to', '主账号', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 6, 1, 0, GETDATE(), GETDATE(), '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_title', '岗位', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 7, 1, 0, GETDATE(), GETDATE(), '666', '["browser",{"valueSpan":"聚才林岗位","replaceDatas":[{"name":"聚才林岗位","id":"666"}],"value":"666"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_level', '职级', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 8, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职级浏览按钮","value":"gradeBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_group_id', '职务类别', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 9, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务分类浏览按钮","value":"postBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_activity', '职务', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 10, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务信息浏览按钮","value":"PostInfoBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'location_id', '办公地点', 'int', 3, 4, 1, 1, 1, NULL, 1, 1, 1, 11, 1, 0, GETDATE(), GETDATE(), '262', '["browser",{"valueSpan":"办公地点","replaceDatas":[{"name":"办公地点","id":"262"}],"value":"262"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'show_order', '显示顺序', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 12, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'ec_company', '分部', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 13, 1, 0, GETDATE(), GETDATE(), '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'ec_department', '部门', 'int', 3, 4, 1, 0, 1, NULL, 0, 0, 1, 14, 1, 0, GETDATE(), GETDATE(), '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'company_start_date', '入职日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 15, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'work_start_date', '参加工作日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 16, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_activity_desc', '职责描述', 'varchar(200)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 17, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'department_id', '部门', 'int', 3, 4, 0, 0, 0, NULL, 0, 0, 1, 18, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","value":"deptBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'login_id', '登录名', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 19, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'job_call', '职称', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 20, 1, 0, GETDATE(), GETDATE(), '260', '["browser",{"valueSpan":"职称","replaceDatas":[{"name":"职称","id":"260"}],"value":"260"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'system_language', '系统语言', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 21, 1, 0, GETDATE(), GETDATE(), '259', '["browser",{"valueSpan":"语言","replaceDatas":[{"name":"语言","id":"259"}],"value":"259"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'resource_image_id', '照片', 'varchar(1000)', 6, 4, 1, 0, 1, NULL, 1, 1, 1, 22, 1, 0, GETDATE(), GETDATE(), '1', '["upload","file"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'messager_url', '头像', 'varchar(1000)', 6, 4, 0, 0, 1, NULL, 1, 1, 1, 23, 1, 0, GETDATE(), GETDATE(), '1', '["upload","file"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'company_id', '分部', 'int', 3, 4, 0, 0, 0, NULL, 0, 0, 1, 24, 1, 0, GETDATE(), GETDATE(), '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"公司分部浏览按钮","value":"compBrowser"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'pass_word', '密码', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 25, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'sec_level', '安全级别', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 26, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'birthday', '出生日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 27, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'folk', '民族', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 28, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'native_place', '籍贯', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 29, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'reg_resident_place', '户口', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 30, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'certificate_num', '身份证号码', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 31, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'marital_status', '婚姻状况', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 32, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"未婚"},{"default":"","unuse":"","id":"1","key":"1","option":"已婚"},{"default":"","unuse":"","id":"2","key":"2","option":"离异"}],"sort":"horizontal"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'policy', '政治面貌', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 33, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'be_member_date', '入团日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 34, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'start_date', '合同开始日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 35, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'be_party_date', '入党日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 36, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'islabouunion', '工会会员', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 37, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"是"},{"default":"","unuse":"","id":"1","key":"1","option":"否"}],"sort":"horizontal"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'education_level', '学历', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 38, 1, 0, GETDATE(), GETDATE(), '30', '["browser",{"valueSpan":"学历","replaceDatas":[{"name":"学历","id":"30"}],"value":"30"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'degree', '学位', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 39, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'health_info', '健康状况', 'int', 5, 4, 0, 0, 1, NULL, 1, 1, 1, 40, 1, 0, GETDATE(), GETDATE(), '1', '["select","select",{"datas":[{"default":"","unuse":"","id":"0","key":"0","option":"优秀"},{"default":"","unuse":"","id":"1","key":"1","option":"良好"},{"default":"","unuse":"","id":"2","key":"2","option":"一般"},{"default":"","unuse":"","id":"3","key":"3","option":"较差"}],"sort":"horizontal"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'height', '身高', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 41, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'weight', '体重', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 42, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'use_kind', '用工性质', 'int', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 43, 1, 0, GETDATE(), GETDATE(), '31', '["browser",{"valueSpan":"用工性质","replaceDatas":[{"name":"用工性质","id":"31"}],"value":"31"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'end_date', '合同结束日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 44, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'probation_end_date', '试用期结束日期', 'char(10)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 45, 1, 0, GETDATE(), GETDATE(), '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"2"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'resident_place', '现居住地', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 46, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'home_address', '家庭联系方式', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 47, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'temp_resident_number', '暂住证号码', 'varchar(60)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 48, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'accum_fund_account', '公积金帐户', 'varchar(30)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 49, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","30"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'account_name', '工资账号户名', 'varchar(200)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 50, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","200"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'bank_id', '工资银行', 'varchar(400)', 3, 4, 0, 0, 1, NULL, 1, 1, 1, 51, 1, 0, GETDATE(), GETDATE(), '284', '["browser",{"valueSpan":"工资银行","replaceDatas":[{"name":"工资银行","id":"284"}],"value":"284"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'account_id', '工资账号', 'varchar(100)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 52, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","100"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'classification', '人员密级', 'int', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 53, 1, 0, GETDATE(), GETDATE(), '2', '["input","int"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'work_year', '工龄', 'decimal(15,2)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 54, 1, 0, GETDATE(), GETDATE(), '3', '["input","float"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'company_work_year', '司龄', 'decimal(15,2)', 1, 4, 0, 0, 1, NULL, 1, 1, 1, 55, 1, 0, GETDATE(), GETDATE(), '3', '["input","float"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'manager_id', '直接上级', 'int', 3, 7, 0, 0, 1, NULL, 1, 1, 1, 1, 1, 0, GETDATE(), GETDATE(), '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'assistant_id', '助理', 'int', 3, 7, 0, 0, 1, NULL, 1, 1, 1, 2, 1, 0, GETDATE(), GETDATE(), '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'mobile', '移动电话', 'varchar(60)', 1, 8, 1, 1, 1, NULL, 1, 1, 1, 1, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'telephone', '办公室电话', 'varchar(60)', 1, 8, 1, 0, 1, NULL, 1, 1, 1, 2, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'mobile_call', '其他电话', 'varchar(60)', 1, 8, 0, 0, 1, NULL, 1, 1, 1, 3, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'fax', '传真', 'varchar(60)', 1, 8, 0, 0, 1, NULL, 1, 1, 1, 4, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'email', '电子邮件', 'varchar(60)', 1, 8, 1, 1, 1, NULL, 1, 1, 1, 5, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +INSERT INTO jcl_field_extendinfo (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(4, 'JCL_ORG_HRMRESOURCE', 'workroom', '办公室', 'varchar(60)', 1, 8, 0, 0, 1, NULL, 1, 1, 1, 6, 1, 0, GETDATE(), GETDATE(), '1', '["input","text","60"]', 0) +GO + + +alter table JCL_ORG_HRMRESOURCE add ec_department int +GO +alter table JCL_ORG_HRMRESOURCE add ec_company int +GO +alter table JCL_ORG_HRMRESOURCE add uuid varchar(50) +GO + + +insert into jcl_org_hrmresource (work_code, last_name, sex, status, account_type, belong_to, job_title, job_level, location_id, show_order, ec_company, company_id, ec_department, department_id, company_start_date, work_start_date, job_activity_desc, resource_image_id, mobile, telephone, email, uuid, delete_type) select a.workcode , a.lastname , a.sex , a.status , a.accounttype , a.belongto , c.id, c.grade_id, a.locationid , a.dsporder , a.subcompanyid1 , c.parent_comp, a.departmentid , c.parent_dept, a.companystartdate , a.workstartdate , a.jobactivitydesc , a.resourceimageid, a.mobile , a.telephone , a.email, a.uuid, 0 from hrmresource a inner join hrmjobtitles b on a.jobtitle = b.id inner join ( select * from jcl_org_job ) c on a.subcompanyid1 = c.ec_company and a.departmentid = c.ec_department and b.jobtitlename = c.job_name +GO \ No newline at end of file diff --git a/docs/脚本/Mysql/浏览按钮mysql.sql b/docs/脚本/Mysql/浏览按钮mysql.sql index 9b7e65cc..3d4352f6 100644 --- a/docs/脚本/Mysql/浏览按钮mysql.sql +++ b/docs/脚本/Mysql/浏览按钮mysql.sql @@ -38,8 +38,8 @@ select @current_time:= date_format( now(),'%T'); INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('PostInfoBrowser', '1', '1', '', 'select * from jcl_org_post_info where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职务信息浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', @current_date, @current_time, NULL, NULL, '', '', '0', uuid(), '', '', '', '', '1', 0, 1); select @datashowset_id:= max(id) from datashowset; INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('PostInfoBrowser', '0', 0, @current_date, @current_time, NULL, NULL); -INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'post_info_no', '', 1, 1, uuid(), NULL); -INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_info_name', '', 0, 2, uuid(), NULL); +INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'post_info_no', '', 0, 1, uuid(), NULL); +INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_info_name', '', 1, 2, uuid(), NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '职务分类', 'post_id', 'select post_name from jcl_org_post where id = {?currentvalue}', 0, 3, uuid(), NULL); INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'post_info_no', '2', '', 1, uuid(), ''); INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'post_info_name', '2', '', 2, uuid(), ''); @@ -92,7 +92,7 @@ INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFI INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'grade_name', '2', '', 2, uuid(), ''); INSERT INTO WF_BROWSER_CONFIG(TYPE,CLAZZ,DESCRIPTION,TITELEBEL) VALUES ('666','com.api.browser.service.impl.JobBrowserService','聚才林岗位管理',538781); -INSERT INTO WORKFLOW_BROWSERURL(ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME, COLUMNAME, KEYCOLUMNAME, LINKURL, TYPEID, USEABLE, ORDERID) VALUES ( '666', '538781', 'varchar(4000)','/systeminfo/BrowserMain.jsp?url=','jcl_org_job', 'job_name', 'id', '/spa/organization/static/index.html#/main/organization/jobExtend/', '8', '1', '0' ); +INSERT INTO WORKFLOW_BROWSERURL(ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME, COLUMNAME, KEYCOLUMNAME, LINKURL, TYPEID, USEABLE, ORDERID) VALUES ( '666', '538781', 'varchar(4000)','/systeminfo/BrowserMain.jsp?url=','jcl_org_job', 'job_name', 'id', '/spa/organization/static/index.html#/main/organization/jobExtend/', '2', '1', '0' ); INSERT INTO WORKFLOW_BROWSERURL_MODULE(BROWSERID,MODULECODE)VALUES('666','workflow'); INSERT INTO HRMJOBGROUPS ( JOBGROUPNAME, JOBGROUPREMARK, created, creater, modified, modifier, uuid ) VALUES ( '聚才林', '聚才林',now(), 1, NULL, NULL, 'd9f435c3-8d4d-4e01-9a97-d72f9c5d5fae' ); diff --git a/docs/脚本/Mysql/组织架构图触发器.sql b/docs/脚本/Mysql/组织架构图触发器.sql index 1cf5a1fc..173ef144 100644 --- a/docs/脚本/Mysql/组织架构图触发器.sql +++ b/docs/脚本/Mysql/组织架构图触发器.sql @@ -1,973 +1,9 @@ -DELIMITER $$ -create trigger HrmCompany_ed after update on HrmCompany FOR EACH ROW -begin - declare _ftype int; - declare _id int; - declare _fobjid int; - declare _fecid int; - declare _uuid varchar(100); - declare _fclass int; - declare _fclassname varchar(100); - declare _fnumber varchar(100); - declare _fname varchar(255); - declare _fleader int; - declare _fleaderimg varchar(255); - declare _fleadername varchar(100); - declare _fleaderjobid int; - declare _fleaderjob varchar(255); - declare _fleaderlv varchar(100); - declare _fleaderst varchar(100); - declare _fparentid int; - declare _fobjparentid int; - declare _fplan int; - declare _fonjob int; - declare _fisvitual int; - declare _fdatebegin date; - declare _fdateend date; - if NEW.companyname <> OLD.companyname then - set _id=0; - set _ftype=0; - set _fobjid=0; - - set _fecid=new.id; - set _uuid=new.uuid; - set _fnumber='00'; - set _fname=new.companyname; - - set _fclass=0; - set _fclassname='行政维度'; - - select cast(fvalue as SIGNED) into _fleader from jcl_info where id=1; - - select messagerurl, lastname, jobtitle into _fleaderimg, _fleadername, _fleaderjobid from hrmresource where id=_fleader; - - select jobtitlemark into _fleaderjob from hrmjobtitles where id=_fleaderjobid; - - - select ifnull(field100008,''), ifnull(field100007,'') into _fleaderst,_fleaderlv from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=_fleader; - - set _fparentid=-1; - - set _fobjparentid=0; - - select cast(now() as date) into _fdatebegin; - - set _fdateend='2099-12-31'; - - select sum(ifnull(staff_num,0)) into _fplan from JCL_ORG_STAFF - where plan_id in (select id from JCL_ORG_STAFFPLAN - where time_start<=_fdatebegin and time_end>=_fdatebegin); - - select count(1) into _fonjob from hrmresource where status<=3; - - set _fisvitual=0; - - delete from jcl_org_map where fobjid=0 and fdatebegin=_fdatebegin; - - update jcl_org_map set fdateend=date_add(_fdatebegin,interval -1 day) where fobjid=0 and fdateend>_fdatebegin; - - insert into jcl_org_map - (id,ftype,fobjid,fecid,Uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (_id,_ftype,_fobjid,_fecid,_uuid,_fclass,_fclassname,_fnumber,_fname,_fleader,_fleaderimg, - _fleadername,_fleaderjobid,_fleaderjob,_fleaderlv,_fleaderst,_fparentid,_fobjparentid, - _fplan,_fonjob,_fisvitual,_fdatebegin,_fdateend); - end if; -END $$ -DELIMITER ; - - -DELIMITER $$ -create trigger JCL_ORG_COMP_in after INSERT on JCL_ORG_COMP FOR EACH ROW -begin - declare _ftype int; - declare _id int; - declare _fobjid int; - declare _fecid int; - declare _uuid varchar(100); - declare _fclass int; - declare _fclassname varchar(100); - declare _fnumber varchar(100); - declare _fname varchar(255); - declare _fleader int; - - declare _fleaderimg varchar(255); - declare _fleadername varchar(100); - declare _fleaderjobid int; - declare _fleaderjob varchar(255); - declare _fleaderlv varchar(100); - declare _fleaderst varchar(100); - declare _fparentid int; - declare _fobjparentid int; - declare _fplan int; - declare _fonjob int; - declare _fisvitual int; - declare _fdatebegin date; - declare _fdateend date; - declare _delete int; - set _ftype=1; - - set _fobjid=new.id; - set _id=new.id; - set _uuid=new.uuid; - set _fnumber=new.comp_no; - set _fname=new.comp_name; - set _fleader=new.comp_principal; - set _fparentid=ifnull(new.parent_company,0); - set _fobjparentid=ifnull(new.parent_company,0); - set _delete=ifnull(new.forbidden_tag,0); - - select id into _fecid from HrmSubCompany where uuid=_uuid; - - set _fclass=0; - set _fclassname='行政维度'; - - select messagerurl, lastname, jobtitle into _fleaderimg,_fleadername,_fleaderjobid from hrmresource where id=_fleader; - - select jobtitlemark into _fleaderjob from hrmjobtitles where id=_fleaderjobid; - - select ifnull(field100008,''),ifnull(field100007,'') into _fleaderst,_fleaderlv from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=_fleader; - - select cast(now() as date) into _fdatebegin; - - set _fdateend='2099-12-31'; - - select sum(ifnull(staff_num,0)) into _fplan from JCL_ORG_STAFF - where plan_id in (select id from JCL_ORG_STAFFPLAN - where time_start<=_fdatebegin and time_end>=_fdatebegin) - and comp_id=_fobjid; - - select count(1) into _fonjob from hrmresource where status<=3 and subcompanyid1=_fecid; - - set _fisvitual=0; - - 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; - - if _delete=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (_id,_ftype,_fobjid,_fecid,_uuid,_fclass,_fclassname,_fnumber,_fname,_fleader,_fleaderimg, - _fleadername,_fleaderjobid,_fleaderjob,_fleaderlv,_fleaderst,_fparentid,_fobjparentid, - _fplan,_fonjob,_fisvitual,_fdatebegin,_fdateend); - end if; -END $$ -DELIMITER ; - -DELIMITER $$ -create trigger JCL_ORG_COMP_ed after update on JCL_ORG_COMP FOR EACH ROW -begin - declare _ftype int; - declare _id int; - declare _fobjid int; - declare _fecid int; - declare _uuid varchar(100); - declare _fclass int; - declare _fclassname varchar(100); - declare _fnumber varchar(100); - declare _fname varchar(255); - declare _fleader int; - - declare _fleaderimg varchar(255); - declare _fleadername varchar(100); - declare _fleaderjobid int; - declare _fleaderjob varchar(255); - declare _fleaderlv varchar(100); - declare _fleaderst varchar(100); - declare _fparentid int; - declare _fobjparentid int; - declare _fplan int; - declare _fonjob int; - declare _fisvitual int; - declare _fdatebegin date; - declare _fdateend date; - declare _delete int; - if NEW.comp_name <> OLD.comp_name or NEW.comp_principal <> OLD.comp_principal or NEW.parent_company <> OLD.parent_company or NEW.forbidden_tag <> OLD.forbidden_tag then - set _ftype=1; - - set _fobjid=new.id; - set _id=new.id; - set _uuid=new.uuid; - set _fnumber=new.comp_no; - set _fname=new.comp_name; - set _fleader=new.comp_principal; - set _fparentid=ifnull(new.parent_company,0); - set _fobjparentid=ifnull(new.parent_company,0); - set _delete=ifnull(new.forbidden_tag,0); - - select id into _fecid from HrmSubCompany where uuid=_uuid; - - set _fclass=0; - set _fclassname='行政维度'; - - select messagerurl, lastname, jobtitle into _fleaderimg,_fleadername,_fleaderjobid from hrmresource where id=_fleader; - - select jobtitlemark into _fleaderjob from hrmjobtitles where id=_fleaderjobid; - - select ifnull(field100008,''),ifnull(field100007,'') into _fleaderst,_fleaderlv from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=_fleader; - - select cast(now() as date) into _fdatebegin; - - set _fdateend='2099-12-31'; - - select sum(ifnull(staff_num,0)) into _fplan from JCL_ORG_STAFF - where plan_id in (select id from JCL_ORG_STAFFPLAN - where time_start<=_fdatebegin and time_end>=_fdatebegin) - and comp_id=_fobjid; - - select count(1) into _fonjob from hrmresource where status<=3 and subcompanyid1=_fecid; - - set _fisvitual=0; - - 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; - - if _delete=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (_id,_ftype,_fobjid,_fecid,_uuid,_fclass,_fclassname,_fnumber,_fname,_fleader,_fleaderimg, - _fleadername,_fleaderjobid,_fleaderjob,_fleaderlv,_fleaderst,_fparentid,_fobjparentid, - _fplan,_fonjob,_fisvitual,_fdatebegin,_fdateend); - end if; - end if; -END $$ -DELIMITER ; - - -DELIMITER $$ -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; - - set _ftype=1; - set _fobjid =old.id; - select cast(now() as date) into _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 ; - - -DROP trigger IF EXISTS JCL_ORG_DEPT_in; -DELIMITER $$ -create trigger JCL_ORG_DEPT_in after INSERT on JCL_ORG_DEPT FOR EACH ROW -begin - declare _ftype int; - declare _id int; - declare _fobjid int; - declare _fecid int; - declare _uuid varchar(100); - declare _fclass int; - declare _fclassname varchar(100); - declare _fnumber varchar(100); - declare _fname varchar(255); - declare _fleader int; - - declare _fleaderimg varchar(255); - declare _fleadername varchar(100); - declare _fleaderjobid int; - declare _fleaderjob varchar(255); - declare _fleaderlv varchar(100); - declare _fleaderst varchar(100); - declare _fparentid int; - declare _fobjparentid int; - declare _fplan int; - declare _fonjob int; - declare _fisvitual int; - declare _fdatebegin date; - declare _fdateend date; - declare _delete int; - - declare _st int; - - set _st=100000000; - - set _ftype=2; - - - set _fobjid = new.id; - set _id = new.id+_st; - set _uuid = new.uuid; - set _fnumber = new.dept_no; - set _fname = new.dept_name; - set _fleader = new.dept_principal; - set _fparentid =(case ifnull(new.parent_dept,0) when 0 then new.parent_comp else new.parent_dept+_st end); - set _fobjparentid = (case ifnull(new.parent_dept,0) when 0 then new.parent_comp else new.parent_dept end); - set _delete = ifnull(new.forbidden_tag,0); - - - - select id into _fecid from HrmDepartment where uuid=_uuid; - - set _fclass=0; - set _fclassname='行政维度'; - - - select messagerurl,lastname,jobtitle into _fleaderimg,_fleadername,_fleaderjobid from hrmresource where id=_fleader; - - select jobtitlemark into _fleaderjob from hrmjobtitles where id=_fleaderjobid; - - - select ifnull(field100008,''),ifnull(field100007,'') into _fleaderst,_fleaderlv from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=_fleader; - - - select cast(now() as date) into _fdatebegin; - - - set _fdateend='2099-12-31'; - - - select sum(ifnull(staff_num,0)) into _fplan from JCL_ORG_STAFF - where plan_id in (select id from JCL_ORG_STAFFPLAN - where time_start<=_fdatebegin and time_end>=_fdatebegin) - and dept_id=_fobjid; - - - select count(1) into _fonjob from hrmresource where status<=3 and departmentid=_fecid; - - - set _fisvitual=0; - - delete from jcl_org_map where ftype=2 and fobjid=_fobjid and fdatebegin=_fdatebegin; - - - update jcl_org_map set fdateend=date_add(_fdatebegin,interval -1 day) where ftype=2 and fobjid=_fobjid and fdateend>_fdatebegin; - - - if _delete=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (_id,_ftype,_fobjid,_fecid,_uuid,_fclass,_fclassname,_fnumber,_fname,_fleader,_fleaderimg, - _fleadername,_fleaderjobid,_fleaderjob,_fleaderlv,_fleaderst,_fparentid,_fobjparentid, - _fplan,_fonjob,_fisvitual,_fdatebegin,_fdateend); - end if; -END $$ -DELIMITER ; - -DROP trigger IF EXISTS JCL_ORG_dept_ed; -DELIMITER $$ -create trigger JCL_ORG_dept_ed after update on JCL_ORG_DEPT FOR EACH ROW -begin - declare _ftype int; - declare _id int; - declare _fobjid int; - declare _fecid int; - declare _uuid varchar(100); - declare _fclass int; - declare _fclassname varchar(100); - declare _fnumber varchar(100); - declare _fname varchar(255); - declare _fleader int; - declare _fleaderimg varchar(255); - declare _fleadername varchar(100); - declare _fleaderjobid int; - declare _fleaderjob varchar(255); - declare _fleaderlv varchar(100); - declare _fleaderst varchar(100); - declare _fparentid int; - declare _fobjparentid int; - declare _fplan int; - declare _fonjob int; - declare _fisvitual int; - declare _fdatebegin date; - declare _fdateend date; - declare _delete int; - - declare _st int; - if (NEW.dept_name <> OLD.dept_name or NEW.dept_principal <> OLD.dept_principal or NEW.parent_dept <> OLD.parent_dept or NEW.forbidden_tag <> OLD.forbidden_tag) then - set _st=100000000; - - set _ftype=2; - - set _fobjid = new.id; - set _id = new.id+_st; - set _uuid = new.uuid; - set _fnumber = new.dept_no; - set _fname = new.dept_name; - set _fleader = new.dept_principal; - set _fparentid = (case ifnull(new.parent_dept,0) when 0 then new.parent_comp else new.parent_dept+_st end); - set _fobjparentid = (case ifnull(new.parent_dept,0) when 0 then new.parent_comp else new.parent_dept end); - set _delete = ifnull(new.forbidden_tag,0); - - - select id into _fecid from HrmDepartment where uuid=_uuid; - - set _fclass=0; - set _fclassname='行政维度'; - - - select messagerurl, lastname, jobtitle into _fleaderimg,_fleadername,_fleaderjobid from hrmresource where id=_fleader; - - select jobtitlemark into _fleaderjob from hrmjobtitles where id=_fleaderjobid; - - - select ifnull(field100008,''), ifnull(field100007,'') into _fleaderst,_fleaderlv from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=_fleader; - - - select cast(now() as date) into _fdatebegin; - - - set _fdateend='2099-12-31'; - - - select sum(ifnull(staff_num,0)) into _fplan from JCL_ORG_STAFF - where plan_id in (select id from JCL_ORG_STAFFPLAN - where time_start<=_fdatebegin and time_end>=_fdatebegin) - and dept_id=_fobjid; - - - select count(1) into _fonjob from hrmresource where status<=3 and departmentid=_fecid; - - - set _fisvitual=0; - - delete from jcl_org_map where ftype=2 and fobjid=_fobjid and fdatebegin=_fdatebegin; - - - update jcl_org_map set fdateend=date_add(_fdatebegin,interval -1 day) where ftype=2 and fobjid=_fobjid and fdateend>_fdatebegin; - - - if _delete=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (_id,_ftype,_fobjid,_fecid,_uuid,_fclass,_fclassname,_fnumber,_fname,_fleader,_fleaderimg, - _fleadername,_fleaderjobid,_fleaderjob,_fleaderlv,_fleaderst,_fparentid,_fobjparentid, - _fplan,_fonjob,_fisvitual,_fdatebegin,_fdateend); - end if; - end if; -END $$ -DELIMITER ; - - - -DELIMITER $$ -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; - - set _ftype=2; - set _fobjid = old.id; - select cast(now() as date) into _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 ; - -DELIMITER $$ -create trigger JCL_ORG_JOB_in after INSERT on JCL_ORG_JOB FOR EACH ROW -BEGIN - declare _ftype int; - declare _id int; - declare _fobjid int; - declare _fecid int; - declare _uuid varchar(100); - declare _fclass int; - declare _fclassname varchar(100); - declare _fnumber varchar(100); - declare _fname varchar(255); - declare _fleader int; - - declare _fleaderimg varchar(255); - declare _fleadername varchar(100); - declare _fleaderjobid int; - declare _fleaderjob varchar(255); - declare _fleaderlv varchar(100); - declare _fleaderst varchar(100); - declare _fparentid int; - declare _fobjparentid int; - declare _fplan int; - declare _fonjob int; - declare _fisvitual int; - declare _fdatebegin date; - declare _fdateend date; - declare _delete int; - - declare _st int; - declare _sj int; - - set _st=100000000; - - - - set _sj=200000000; - - - set _ftype=3; - - set _fobjid = new.id; - set _id = new.id+_sj; - set _fnumber = new.job_no; - set _fname = new.job_name; - set _fparentid = (case ifnull(new.parent_job,0) when 0 then new.parent_dept+_st else new.parent_job+_sj end); - set _fobjparentid = (case ifnull(new.parent_job,0) when 0 then new.parent_dept else new.parent_job end); - set _delete=ifnull(new.forbidden_tag,0); - - set _fclass=0; - set _fclassname='行政维度'; - - select cast(now() as date) into _fdatebegin; - - - set _fdateend='2099-12-31'; - - - select sum(ifnull(staff_num,0)) into _fplan from JCL_ORG_STAFF - where plan_id in (select id from JCL_ORG_STAFFPLAN - where time_start<=_fdatebegin and time_end>=_fdatebegin) - and job_id=_fobjid; - - - select count(1) into _fonjob from hrmresource where status<=3 - and departmentid=(select id from hrmdepartment where uuid=(select uuid from JCL_ORG_DEPT where id=new.PARENT_DEPT)) - and jobtitle in (select id from hrmjobtitles where JOBTITLENAME=new.JOB_NAME); - - - set _fisvitual=0; - - 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; - - - if _delete=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (_id,_ftype,_fobjid,_fecid,_uuid,_fclass,_fclassname,_fnumber,_fname,_fleader,_fleaderimg, - _fleadername,_fleaderjobid,_fleaderjob,_fleaderlv,_fleaderst,_fparentid,_fobjparentid, - _fplan,_fonjob,_fisvitual,_fdatebegin,_fdateend); - end if; -END $$ -DELIMITER ; - - - -DELIMITER $$ -create trigger JCL_ORG_JOB_ed after UPDATE on JCL_ORG_JOB FOR EACH ROW -begin - declare _ftype int; - declare _id int; - declare _fobjid int; - declare _fecid int; - declare _uuid varchar(100); - declare _fclass int; - declare _fclassname varchar(100); - declare _fnumber varchar(100); - declare _fname varchar(255); - declare _fleader int; - - declare _fleaderimg varchar(255); - declare _fleadername varchar(100); - declare _fleaderjobid int; - declare _fleaderjob varchar(255); - declare _fleaderlv varchar(100); - declare _fleaderst varchar(100); - declare _fparentid int; - declare _fobjparentid int; - declare _fplan int; - declare _fonjob int; - declare _fisvitual int; - declare _fdatebegin date; - declare _fdateend date; - declare _delete int; - - declare _st int; - declare _sj int; - if NEW.job_name <> OLD.job_name or NEW.parent_dept <> OLD.parent_dept or NEW.parent_job <> OLD.parent_job or NEW.forbidden_tag <> OLD.forbidden_tag then - set _st=100000000; - set _sj=200000000; - set _ftype=3; - - set _fobjid=new.id; - set _id=new.id+_sj; - set _fnumber=new.job_no; - set _fname=new.job_name; - set _fparentid=(case ifnull(new.parent_job,0) when 0 then new.parent_dept+_st else new.parent_job+_sj end); - set _fobjparentid=(case ifnull(new.parent_job,0) when 0 then new.parent_dept else new.parent_job end); - set _delete=ifnull(new.forbidden_tag,0); - - - set _fclass=0; - set _fclassname='行政维度'; - - select cast(now() as date) into _fdatebegin; - - - set _fdateend='2099-12-31'; - - - select sum(ifnull(staff_num,0)) into _fplan from JCL_ORG_STAFF - where plan_id in (select id from JCL_ORG_STAFFPLAN - where time_start<=_fdatebegin and time_end>=_fdatebegin) - and job_id=_fobjid; - - - select count(1) into _fonjob from hrmresource where status<=3 - and departmentid=(select id from hrmdepartment where uuid=(select uuid from JCL_ORG_DEPT where id=new.PARENT_DEPT)) - and jobtitle in (select id from hrmjobtitles where JOBTITLENAME=new.JOB_NAME); - - - set _fisvitual=0; - - 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; - - - if _delete=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (_id,_ftype,_fobjid,_fecid,_uuid,_fclass,_fclassname,_fnumber,_fname,_fleader,_fleaderimg, - _fleadername,_fleaderjobid,_fleaderjob,_fleaderlv,_fleaderst,_fparentid,_fobjparentid, - _fplan,_fonjob,_fisvitual,_fdatebegin,_fdateend); - end if; - end if; -END $$ -DELIMITER ; - - - - - -DELIMITER $$ -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; - - set _ftype=3; - set _fobjid = old.id; - select cast(now() as date) into _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 ; - - -DELIMITER $$ -create trigger hrmresource_in after INSERT on hrmresource FOR EACH ROW -begin - declare _ftype int; - declare _id int; - declare _fobjid int; - declare _fecid int; - declare _uuid varchar(100); - declare _fclass int; - declare _fclassname varchar(100); - declare _fnumber varchar(100); - declare _fname varchar(255); - declare _fleader int; - - declare _fleaderimg varchar(255); - declare _fleadername varchar(100); - declare _fleaderjobid int; - declare _fleaderjob varchar(255); - declare _fleaderlv varchar(100); - declare _fleaderst varchar(100); - declare _fparentid int; - declare _fobjparentid int; - declare _fplan int; - declare _fonjob int; - declare _fisvitual int; - declare _fdatebegin date; - declare _fdateend date; - declare _delete int; - declare _wz int; - declare _str varchar(100); - declare _st int; - declare _sj int; - declare _sk int; - set _st=100000000; - set _sj=200000000; - set _sk=300000000; - set _ftype=4; - - set _fobjid=new.id; - set _id=new.id+_sk; - set _fnumber=new.workcode; - set _fname=new.lastname; - set _delete=case when new.status<=3 then 0 else 1 end; - set _fleaderimg=new.messagerurl; - set _fleadername=new.lastname; - set _fleaderjobid=new.jobtitle; - - - select ifnull(field100002,'') into _str from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=_fobjid; - set _wz=LOCATE('_',_str); - set _fobjparentid=cast(right(_str,length(_str)-_wz) as SIGNED); - set _fparentid=_fobjparentid+_sj; - - - set _fclass=0; - set _fclassname='行政维度'; - - select jobtitlemark into _fleaderjob from hrmjobtitles where id=_fleaderjobid; - - - select ifnull(field100008,''),ifnull(field100007,'') into _fleaderst,_fleaderlv from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=_fobjid; - - - select cast(now() as date) into _fdatebegin; - - - set _fdateend='2099-12-31'; - - - set _fisvitual=0; - - - 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; - - - if _delete=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (_id,_ftype,_fobjid,_fecid,_uuid,_fclass,_fclassname,_fnumber,_fname,_fleader,_fleaderimg, - _fleadername,_fleaderjobid,_fleaderjob,_fleaderlv,_fleaderst,_fparentid,_fobjparentid, - _fplan,_fonjob,_fisvitual,_fdatebegin,_fdateend); - end if; -END $$ -DELIMITER ; - - -DELIMITER $$ -create trigger hrmresource_ed after update on hrmresource FOR EACH ROW -begin - declare _ftype int; - declare _id int; - declare _fobjid int; - declare _fecid int; - declare _uuid varchar(100); - declare _fclass int; - declare _fclassname varchar(100); - declare _fnumber varchar(100); - declare _fname varchar(255); - declare _fleader int; - - declare _fleaderimg varchar(255); - declare _fleadername varchar(100); - declare _fleaderjobid int; - declare _fleaderjob varchar(255); - declare _fleaderlv varchar(100); - declare _fleaderst varchar(100); - declare _fparentid int; - declare _fobjparentid int; - declare _fplan int; - declare _fonjob int; - declare _fisvitual int; - declare _fdatebegin date; - declare _fdateend date; - declare _delete int; - declare _wz int; - declare _str varchar(100); - declare _st int; - declare _sj int; - declare _sk int; - if NEW.lastname <> OLD.lastname or NEW.status <> OLD.status then - set _st=100000000; - set _sj=200000000; - set _sk=300000000; - set _ftype=4; - - set _fobjid=new.id; - set _id=new.id+_sk; - set _fnumber=new.workcode; - set _fname=new.lastname; - set _delete=case when new.status<=3 then 0 else 1 end; - set _fleaderimg=new.messagerurl; - set _fleadername=new.lastname; - set _fleaderjobid=new.jobtitle; - - - select ifnull(field100002,'') into _str from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=_fobjid; - set _wz=LOCATE('_',_str); - set _fobjparentid=cast(right(_str,length(_str)-_wz) as SIGNED); - set _fparentid=_fobjparentid+_sj; - - - set _fclass=0; - set _fclassname='行政维度'; - - select jobtitlemark into _fleaderjob from hrmjobtitles where id=_fleaderjobid; - - - select ifnull(field100008,''),ifnull(field100007,'') into _fleaderst,_fleaderlv from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=_fobjid; - - - select cast(now() as date) into _fdatebegin; - - - set _fdateend='2099-12-31'; - - - set _fisvitual=0; - - - 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; - - - if _delete=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (_id,_ftype,_fobjid,_fecid,_uuid,_fclass,_fclassname,_fnumber,_fname,_fleader,_fleaderimg, - _fleadername,_fleaderjobid,_fleaderjob,_fleaderlv,_fleaderst,_fparentid,_fobjparentid, - _fplan,_fonjob,_fisvitual,_fdatebegin,_fdateend); - end if; - end if; -END $$ -DELIMITER ; - - -DROP trigger IF EXISTS cus_fielddata_jclgw; -DELIMITER $$ -create trigger cus_fielddata_jclgw after UPDATE on cus_fielddata FOR EACH ROW -begin - declare _ftype int; - declare _id int; - declare _fobjid int; - declare _fecid int; - declare _uuid varchar(100); - declare _fclass int; - declare _fclassname varchar(100); - declare _fnumber varchar(100); - declare _fname varchar(255); - declare _fleader int; - - declare _fleaderimg varchar(255); - declare _fleadername varchar(100); - declare _fleaderjobid int; - declare _fleaderjob varchar(255); - declare _fleaderlv varchar(100); - declare _fleaderst varchar(100); - declare _fparentid int; - declare _fobjparentid int; - declare _fplan int; - declare _fonjob int; - declare _fisvitual int; - declare _fdatebegin date; - declare _fdateend date; - declare _delete int; - declare _wz int; - declare _str varchar(100); - declare _st int; - declare _sj int; - declare _sk int; - if NEW.field100002 <> OLD.field100002 then - set _st=100000000; - set _sj=200000000; - set _sk=300000000; - set _ftype=4; - - - set _fobjid=new.id; - set _id=new.id+_sk; - set _str=ifnull(new.field100002,''); - - select workcode, lastname, case when status <= 3 then 0 else 1 end, messagerurl, lastname, jobtitle into _fnumber, _fname , _delete, _fleaderimg , _fleadername, _fleaderjobid from hrmresource where id = _fobjid; - - - set _wz=LOCATE('_',_str); - set _fobjparentid=cast(right(_str,length(_str)-_wz) as SIGNED); - set _fparentid=_fobjparentid+_sj; - - set _fclass=0; - set _fclassname='行政维度'; - - select jobtitlemark into _fleaderjob from hrmjobtitles where id=_fleaderjobid; - - - select ifnull(field100008,''), ifnull(field100007,'') into _fleaderst,_fleaderlv from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=_fobjid; - - - select cast(now() as date) into _fdatebegin; - - - set _fdateend='2099-12-31'; - - - set _fisvitual=0; - - 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; - - - if _delete=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (_id,_ftype,_fobjid,_fecid,_uuid,_fclass,_fclassname,_fnumber,_fname,_fleader,_fleaderimg, - _fleadername,_fleaderjobid,_fleaderjob,_fleaderlv,_fleaderst,_fparentid,_fobjparentid, - _fplan,_fonjob,_fisvitual,_fdatebegin,_fdateend); - end if; - end if; -END $$ -DELIMITER ; - - - - insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fplan,fonjob,fisvitual,fdatebegin,fdateend) select a.id,1,a.id,b.id,a.uuid,0,'行政维度',a.comp_no,a.comp_name,a.comp_principal,c.messagerurl, - c.lastname,c.jobtitle,d.jobtitlemark,g.field100007,g.field100008,ifnull(parent_company,0),ifnull(parent_company,0), + c.lastname,c.jobtitle,d.jobtitlemark,g.job_level,g.job_grade,ifnull(parent_company,0),ifnull(parent_company,0), ifnull(e.fcnt,0),ifnull(f.fcnt,0),0,NOW(),'2099-12-31' from JCL_ORG_comp as a @@ -980,7 +16,7 @@ from group by comp_id) e on a.id=e.comp_id left join (select subcompanyid1,count(1) fcnt from hrmresource where status<=3 group by subcompanyid1) f on f.subcompanyid1=b.id - left join cus_fielddata g on c.id=g.id and g.scope='HrmCustomFieldByInfoType' and g.scopeid=3 + left join jcl_org_hrmresource g on c.uuid=g.uuid where ifnull(a.delete_type,0) <>1 and ifnull(a.forbidden_tag,0) <>1; @@ -991,7 +27,7 @@ insert into jcl_org_map fplan,fonjob,fisvitual,fdatebegin,fdateend) select a.id+100000000,2,a.id,b.id,a.uuid,0,'行政维度',a.dept_no,a.dept_name,a.dept_principal,c.messagerurl, - c.lastname,c.jobtitle,d.jobtitlemark,g.field100007,g.field100008, + c.lastname,c.jobtitle,d.jobtitlemark,g.job_level,g.job_grade, (case ifnull(parent_dept,0) when 0 then parent_comp else parent_dept+100000000 end), (case ifnull(parent_dept,0) when 0 then parent_comp else parent_dept end), ifnull(e.fcnt,0),ifnull(f.fcnt,0),0,NOW(),'2099-12-31' @@ -1005,7 +41,7 @@ from where time_start<=NOW() and time_end>NOW()) group by dept_id) e on a.id=e.dept_id 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 + left join jcl_org_hrmresource g ON c.uuid = g.uuid where ifnull(a.delete_type,0) <>1 and ifnull(a.forbidden_tag,0) <>1; @@ -1032,27 +68,18 @@ from JCL_ORG_job as a where ifnull(a.delete_type,0) <>1 and ifnull(a.forbidden_tag,0) <>1 and a.id>=10; -delete from cus_fielddata where scopeid=-1; -insert into cus_fielddata(scope, scopeid, id, field100002) -select 'HrmCustomFieldByInfoType',-1,a.id,CONCAT('199_',e.id) -from hrmresource a - 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; - insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleaderimg, fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fisvitual,fdatebegin,fdateend) -select a.id+300000000,4,a.id,a.id,a.uuid,0,'行政维度',a.workcode,a.lastname,a.messagerurl,a.jobtitle, - b.jobtitlemark,c.field100007,c.field100008, - right(ifnull(field100002,''),LENGTH(ifnull(field100002,''))-LOCATE('_',ifnull(field100002,''))) +200000000, - right(ifnull(field100002,''),LENGTH(ifnull(field100002,''))-LOCATE('_',ifnull(field100002,''))), +select a.id+300000000,4,a.id,a.id,a.uuid,0,'行政维度',a.work_code,a.last_name,c.messagerurl,b.id, + b.job_name,a.job_level,a.job_grade, + ifnull( b.id, '' ) +200000000, + b.id, 0,NOW(),'2099-12-31' -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 +from jcl_org_hrmresource a + left join jcl_org_job b ON a.job_title = b.id + left join hrmresource c on a.uuid = c.uuid where a.status<4; insert into jcl_org_map diff --git a/docs/脚本/Mysql/表结构、初始化数据.sql b/docs/脚本/Mysql/表结构、初始化数据.sql index 5497f737..871ff19e 100644 --- a/docs/脚本/Mysql/表结构、初始化数据.sql +++ b/docs/脚本/Mysql/表结构、初始化数据.sql @@ -84,6 +84,7 @@ CREATE TABLE `jcl_org_comp` ( `comp_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `comp_name_short` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `parent_company` int(11) NULL DEFAULT NULL, + `ec_company` int(11) NULL DEFAULT NULL, `org_code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `industry` int(11) NULL DEFAULT NULL, `comp_principal` int(11) NULL DEFAULT NULL, @@ -133,7 +134,9 @@ CREATE TABLE `jcl_org_dept` ( `dept_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `dept_name_short` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `parent_comp` int(11) NULL DEFAULT NULL, + `ec_company` int(11) NULL DEFAULT NULL, `parent_dept` int(11) NULL DEFAULT NULL, + `ec_department` int(11) NULL DEFAULT NULL, `dept_principal` int(11) NULL DEFAULT NULL, `show_order` int(11) NULL DEFAULT NULL, `description` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL, @@ -482,7 +485,9 @@ CREATE TABLE `jcl_org_staff` ( `id` int(11) NOT NULL AUTO_INCREMENT, `plan_id` int(11) NULL DEFAULT NULL, `comp_id` int(11) NULL DEFAULT NULL, + `ec_company` int(11) NULL DEFAULT NULL, `dept_id` int(11) NULL DEFAULT NULL, + `ec_department` int(11) NULL DEFAULT NULL, `job_id` int(11) NULL DEFAULT NULL, `staff_num` int(11) NULL DEFAULT NULL, `control_policy` int(11) NULL DEFAULT NULL, @@ -508,6 +513,7 @@ CREATE TABLE `jcl_org_staffplan` ( `time_start` date NULL DEFAULT NULL, `time_end` date NULL DEFAULT NULL, `company_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `ec_company` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `control_dimension` varchar(5) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `description` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL, `forbidden_tag` int(11) NULL DEFAULT NULL, @@ -527,11 +533,11 @@ CREATE TABLE `jcl_org_staffs` ( `change_num` int(11) NULL DEFAULT NULL, `business_source` int(11) NULL DEFAULT NULL, `requestid` int(11) NULL DEFAULT NULL, + `description` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `creator` int(11) NULL DEFAULT NULL, `delete_type` int(11) NULL DEFAULT NULL, `create_time` datetime NULL DEFAULT NULL, `update_time` datetime NULL DEFAULT NULL, - `description` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; @@ -576,7 +582,7 @@ insert INTO jcl_field_extendtitle (id, group_id, title, creator, delete_type, cr insert INTO jcl_field_extendtitle (id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default) VALUES (8, 4, '通讯信息', 1, 0, now(), NULL, 3, 1, 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 (2, 1, 'JCL_ORG_COMP', 'comp_name', '名称', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, now(), NULL, '1', '["input","text","100"]', 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 (3, 1, 'JCL_ORG_COMP', 'parent_company', '上级公司', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, now(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (3, 1, 'JCL_ORG_COMP', 'parent_company', '上级公司', 'int', 3, 1, 1, 0, 0, 0, 0, 0, 1, 6, 1, 0, now(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (1, 1, 'JCL_ORG_COMP', 'comp_no', '编号', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, now(), NULL, '1', '["input","text","100"]', 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 (4, 1, 'JCL_ORG_COMP', 'industry', '行业', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 8, 1, 0, now(), NULL, '63', 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 (5, 1, 'JCL_ORG_COMP', 'comp_name_short', '简称', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 0, now(), NULL, '1', '["input","text","100"]', 0); @@ -588,8 +594,8 @@ 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 (11, 2, 'JCL_ORG_DEPT', 'dept_no', '编号', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, now(), NULL, '1', '["input","text","100"]', 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 (12, 2, 'JCL_ORG_DEPT', 'dept_name', '名称', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, now(), NULL, '1', '["input","text","100"]', 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 (13, 2, 'JCL_ORG_DEPT', 'dept_name_short', '简称', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, now(), NULL, '1', '["input","text","100"]', 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 (14, 2, 'JCL_ORG_DEPT', 'parent_comp', '所属分部', 'int', 3, 2, 1, 1, 1, 1, 1, 1, 1, 4, 1, 0, now(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (15, 2, 'JCL_ORG_DEPT', 'parent_dept', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, now(), NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","replaceDatas":[{"showname":"deptBrowser","shownamespan":"deptBrowser","namespan":"部门浏览按钮","name":"部门浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","id":"deptBrowser","randomFieldId":"deptBrowser"}],"value":"deptBrowser"}]', 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 (14, 2, 'JCL_ORG_DEPT', 'parent_comp', '所属分部', 'int', 3, 2, 1, 1, 0, 0, 0, 0, 1, 4, 1, 0, now(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (15, 2, 'JCL_ORG_DEPT', 'parent_dept', '上级部门', 'int', 3, 2, 1, 0, 0, 0, 0, 0, 1, 5, 1, 0, now(), NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","replaceDatas":[{"showname":"deptBrowser","shownamespan":"deptBrowser","namespan":"部门浏览按钮","name":"部门浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","id":"deptBrowser","randomFieldId":"deptBrowser"}],"value":"deptBrowser"}]', 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 (16, 2, 'JCL_ORG_DEPT', 'dept_principal', '部门负责人', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, now(), NULL, '1', 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 (17, 2, 'JCL_ORG_DEPT', 'show_order', '显示顺序', 'int', 1, 2, 1, 0, 1, 1, 1, 1, 1, 7, 1, 0, now(), NULL, '2', 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 (18, 2, 'JCL_ORG_DEPT', 'description', '说明', 'text', 2, 2, 1, 0, 1, 1, 1, 0, 1, 8, 1, 0, now(), NULL, NULL, NULL, 0); @@ -603,7 +609,7 @@ 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 (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, 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 (29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 0, 0, 0, 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, 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); @@ -675,6 +681,10 @@ 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 (98, 4, 'JCL_ORG_HRMRESOURCE', 'classification', '人员密级', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 52, 1, 0, now(), NULL, '2', '["input","int"]', 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 (99, 4, 'JCL_ORG_HRMRESOURCE', 'work_year', '工龄', 'decimal(15,2)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 53, 1, 0, now(), NULL, '3', '["input","float","2"]', 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 (100, 4, 'JCL_ORG_HRMRESOURCE', 'company_work_year', '司龄', 'decimal(15,2)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 54, 1, 0, now(), NULL, '3', '["input","float","2"]', 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 (101, 1, 'JCL_ORG_COMP', 'ec_company', '上级公司', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 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 (102, 2, 'JCL_ORG_DEPT', 'ec_company', '所属分部', 'int', 3, 2, 1, 1, 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 (103, 2, 'JCL_ORG_DEPT', 'ec_department', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, now(), NULL, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0); + CREATE TABLE `JCL_INFO` ( `id` int(11) NOT NULL AUTO_INCREMENT, diff --git a/docs/脚本/Oracle/浏览按钮Oracle.sql b/docs/脚本/Oracle/浏览按钮Oracle.sql index 496dbde3..7baaea16 100644 --- a/docs/脚本/Oracle/浏览按钮Oracle.sql +++ b/docs/脚本/Oracle/浏览按钮Oracle.sql @@ -78,7 +78,7 @@ INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFI INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '名称', 'grade_name', '2', '', 2, SYS_GUID(), ''); INSERT INTO WF_BROWSER_CONFIG(TYPE,CLAZZ,DESCRIPTION,TITELEBEL) VALUES ('666','com.api.browser.service.impl.JobBrowserService','聚才林岗位管理',538781); -INSERT INTO WORKFLOW_BROWSERURL(ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME, COLUMNAME, KEYCOLUMNAME, LINKURL, TYPEID, USEABLE, ORDERID) VALUES ( '666', '538781', 'varchar(4000)','/systeminfo/BrowserMain.jsp?url=','jcl_org_job', 'job_name', 'id', '/spa/organization/static/index.html#/main/organization/jobExtend/', '8', '1', '0' ); +INSERT INTO WORKFLOW_BROWSERURL(ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME, COLUMNAME, KEYCOLUMNAME, LINKURL, TYPEID, USEABLE, ORDERID) VALUES ( '666', '538781', 'varchar(4000)','/systeminfo/BrowserMain.jsp?url=','jcl_org_job', 'job_name', 'id', '/spa/organization/static/index.html#/main/organization/jobExtend/', '2', '1', '0' ); INSERT INTO WORKFLOW_BROWSERURL_MODULE(BROWSERID,MODULECODE)VALUES('666','workflow'); INSERT INTO HRMJOBGROUPS ( JOBGROUPNAME, JOBGROUPREMARK, created, creater, modified, modifier, uuid ) VALUES ( '聚才林', '聚才林',SYSDATE, 1, NULL, NULL, 'd9f435c3-8d4d-4e01-9a97-d72f9c5d5fae' ); diff --git a/docs/脚本/Oracle/组织架构图触发器.sql b/docs/脚本/Oracle/组织架构图触发器.sql index 75277090..0e72604e 100644 --- a/docs/脚本/Oracle/组织架构图触发器.sql +++ b/docs/脚本/Oracle/组织架构图触发器.sql @@ -1,380 +1,3 @@ -create or replace trigger HrmCompany_ed before update on HrmCompany FOR EACH ROW -declare -vleader int; - vleaderimg varchar2(255); - vleadername varchar2(100); - vleaderjobid int; - vleaderjob varchar2(255); - vleaderlv varchar2(100); - vleaderst varchar2(100); - vdatebegin date; - vplan int; - vonjob int; - vcnt int; -begin - if :new.companyname!=:old.companyname then - -select count(1) into vcnt from jcl_info where id=1; -if vcnt=1 then -select to_number(fvalue) into vleader from jcl_info where id=1; -end if; - -select count(1) into vcnt from hrmresource where id=vleader; -if vcnt=1 then -select messagerurl,lastname,jobtitle into vleaderimg,vleadername,vleaderjobid -from hrmresource where id=vleader; -end if; - -select count(1) into vcnt from hrmjobtitles where id=vleaderjobid; -if vcnt=1 then -select jobtitlemark into vleaderjob from hrmjobtitles where id=vleaderjobid; -end if; - -select count(1) into vcnt from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=vleader; -if vcnt=1 then -select nvl(field100008,''),nvl(field100007,'') into vleaderst,vleaderlv from cus_fielddata -where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=vleader; -end if; - - vdatebegin:=sysdate; - -select sum(nvl(staff_num,0)) into vplan from JCL_ORG_STAFF -where plan_id in (select id from JCL_ORG_STAFFPLAN where time_start<=vdatebegin and time_end>=vdatebegin); - -select count(1) into vonjob from hrmresource where status<=3; - -delete from jcl_org_map where fobjid=0 and fdatebegin=vdatebegin; - -update jcl_org_map set fdateend=vdatebegin-1 where fobjid=0 and fdateend>vdatebegin; - -insert into jcl_org_map -(id,ftype,fobjid,fecid,Uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) -values - (0,0,0,:new.id,:new.uuid,0,'行政维度','00',:new.companyname,vleader,vleaderimg, - vleadername,vleaderjobid,vleaderjob,vleaderlv,vleaderst,-1,0, - vplan,vonjob,0,vdatebegin,to_date('2099-12-31','yyyy-mm-dd')); - -end if; -end; -/ - -create or replace trigger JCL_ORG_COMP_ed after insert or update on JCL_ORG_COMP FOR EACH ROW -declare -vdatebegin date; - vecid int; - vleaderimg varchar2(255); - vleadername varchar2(100); - vleaderjobid int; - vleaderjob varchar2(255); - vleaderlv varchar2(100); - vleaderst varchar2(100); - vparentid int; - vobjparentid int; - vplan int; - vonjob int; - vcnt int; -begin - if :new.comp_name!=:old.comp_name or :new.comp_principal!=:old.comp_principal or :new.parent_company!=:old.parent_company - or :new.forbidden_tag!=:old.forbidden_tag or :new.DELETE_TYPE!=:old.DELETE_TYPE then - - vdatebegin:=sysdate; - vparentid:=nvl(:new.parent_company,0); - vobjparentid:=nvl(:new.parent_company,0); - -select count(1) into vcnt from HrmSubCompany where uuid=:new.uuid; -if vcnt=1 then -select id into vecid from HrmSubCompany where uuid=:new.uuid; -end if; - -select count(1) into vcnt from hrmresource where id=:new.comp_principal; -if vcnt=1 then -select messagerurl,lastname,jobtitle into vleaderimg,vleadername,vleaderjobid from hrmresource where id=:new.comp_principal; -end if; - -select count(1) into vcnt from hrmjobtitles where id=vleaderjobid; -if vcnt=1 then -select jobtitlemark into vleaderjob from hrmjobtitles where id=vleaderjobid; -end if; - -select count(1) into vcnt from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=:new.comp_principal; -if vcnt=1 then -select nvl(field100008,''),nvl(field100007,'') into vleaderst,vleaderlv from cus_fielddata -where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=:new.comp_principal; -end if; - -select sum(nvl(staff_num,0)) into vplan from JCL_ORG_STAFF; -select count(1) into vonjob from hrmresource where status<=3 and subcompanyid1=vecid; - -delete from jcl_org_map where ftype=1 and fobjid=:new.id and fdatebegin=vdatebegin; -update jcl_org_map set fdateend=vdatebegin-1 where ftype=1 and fobjid=:new.id and fdateend>vdatebegin; -if nvl(:new.DELETE_TYPE,0)=0 and nvl(:new.forbidden_tag,0)=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (:new.id,1,:new.id,vecid,:new.uuid,0,'行政维度',:new.comp_no,:new.comp_name,:new.comp_principal, - vleaderimg,vleadername,vleaderjobid,vleaderjob,vleaderlv,vleaderst,vparentid,vobjparentid, - vplan,vonjob,0,vdatebegin,to_date('2099-12-31','yyyy-mm-dd')); -end if; -end if; -end; -/ - -create or replace trigger JCL_ORG_dept_ed after insert or update on JCL_ORG_dept FOR EACH ROW -declare -st int; - vdatebegin date; - vparentid int; - vobjparentid int; - vecid int; - vleaderimg VARCHAR2(200); - vleadername VARCHAR2(200); - veaderjobid int; - vleaderjob VARCHAR2(255); - vleaderst VARCHAR2(255); - vleaderlv VARCHAR2(255); - vplan int; - vonjob int; - vcnt int; -begin - if :new.dept_name!=:old.dept_name or :new.dept_principal!=:old.dept_principal or :new.parent_comp!=:old.parent_comp - or :new.parent_dept!=:old.parent_dept or :new.forbidden_tag!=:old.forbidden_tag or :new.DELETE_TYPE!=:old.DELETE_TYPE then - - st:=100000000; - vdatebegin:=sysdate; - if :new.parent_dept=0 then - vparentid:=:new.parent_comp; -else - vparentid:=:new.parent_dept+st; -end if; - - if nvl(:new.parent_dept,0)=0 then - vobjparentid:=:new.parent_comp; -else - vobjparentid:=:new.parent_dept+st; -end if; - -select count(1) into vcnt from HrmDepartment where uuid=:new.uuid; -if vcnt=1 then -select id into vecid from HrmDepartment where uuid=:new.uuid; -end if; - -select count(1) into vcnt from hrmresource where id=:new.dept_principal; -if vcnt=1 then -select messagerurl,lastname,jobtitle into vleaderimg,vleadername,veaderjobid -from hrmresource where id=:new.dept_principal; -end if; - -select count(1) into vcnt from hrmjobtitles where id=:new.dept_principal; -if vcnt=1 then -select jobtitlemark into vleaderjob from hrmjobtitles where id=:new.dept_principal; - -end if; - -select count(1) into vcnt from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=:new.dept_principal; -if vcnt=1 then -select nvl(field100008,''),nvl(field100007,'') into vleaderst,vleaderlv from cus_fielddata -where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=:new.dept_principal; -end if; - -select sum(nvl(staff_num,0)) into vplan from JCL_ORG_STAFF -where plan_id in (select id from JCL_ORG_STAFFPLAN where time_start<=vdatebegin and time_end>=vdatebegin) and dept_id=:new.id; - -select count(1) into vonjob from hrmresource where status<=3 and departmentid=vecid; - -delete from jcl_org_map where ftype=2 and fobjid=:new.id and fdatebegin=vdatebegin; -update jcl_org_map set fdateend=vdatebegin-1 where ftype=2 and fobjid=:new.id and fdateend>vdatebegin; - -if nvl(:new.forbidden_tag,0)=0 and nvl(:new.DELETE_TYPE,0)=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (:new.id+st,2,:new.id,vecid,:new.uuid,0,'行政维度',:new.dept_no,:new.dept_name,:new.dept_principal, - vleaderimg,vleadername,veaderjobid,vleaderjob,vleaderlv,vleaderst,vparentid,vobjparentid, - vplan,vonjob,0,vdatebegin,to_date('2099-12-31','yyyy-mm-dd')); -end if; -end if; -end; -/ - - -create or replace trigger JCL_ORG_job_ed after insert or update on JCL_ORG_job FOR EACH ROW -declare -st int; - sj int; - vplan int; - vonjob int; - vdatebegin date; - vparentid int; - vobjparentid int; -begin - if :new.job_name!=:old.job_name or :new.parent_dept!=:old.parent_dept or :new.parent_job!=:old.parent_job - or :new.forbidden_tag!=:old.forbidden_tag or :new.DELETE_TYPE!=:old.DELETE_TYPE then - st:=100000000; - sj:=200000000; - vdatebegin:=to_date(sysdate); - -select case nvl(:new.parent_job,0) when 0 then :new.parent_dept+st else :new.parent_job+sj end, - case nvl(:new.parent_job,0) when 0 then :new.parent_dept else :new.parent_job end -into vparentid,vobjparentid from dual; - -select sum(nvl(staff_num,0)) into vplan from JCL_ORG_STAFF -where plan_id in (select id from JCL_ORG_STAFFPLAN where time_start<=vdatebegin and time_end>=vdatebegin) and job_id=:new.id; - -select count(1) into vonjob from hrmresource where status<=3 - and departmentid=(select id from hrmdepartment where uuid=(select uuid from JCL_ORG_DEPT where id=:new.PARENT_DEPT)) - and jobtitle in (select id from hrmjobtitles where JOBTITLENAME=:new.JOB_NAME); - -delete from jcl_org_map where ftype=3 and fobjid=:new.id and fdatebegin=vdatebegin; -update jcl_org_map set fdateend=vdatebegin-1 where ftype=3 and fobjid=:new.id and fdateend>vdatebegin; - -if nvl(:new.forbidden_tag,0)=0 and nvl(:new.DELETE_TYPE,0)=0 then - insert into jcl_org_map - (id,ftype,fobjid,fclass,fclassname,fnumber,fname,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (:new.id+sj,3,:new.id,0,'行政维度',:new.job_no,:new.job_name,vparentid,vobjparentid, - vplan,vonjob,0,vdatebegin,to_date('2099-12-31','yyyy-mm-dd')); -end if; -end if; -end; -/ - -create or replace trigger hrmresource_ed after insert or update on hrmresource FOR EACH ROW -declare -st int; - sj int; - sk int; - vdatebegin date; - vdelete int; - vleaderjob VARCHAR2(255); - vparentid int; - vobjparentid int; - vleaderst VARCHAR2(255); - vleaderlv VARCHAR2(255); - vstr VARCHAR2(255); - vwz int; - vcnt int; -begin - if :new.lastname!=:old.lastname or :new.status!=:old.status then - st:=100000000; - sj:=200000000; - sk:=300000000; - vdatebegin:=to_date(sysdate); - - if :new.status<=3 then - vdelete:=0; -else - vdelete:=1; -end if; - -select count(1) into vcnt from hrmjobtitles where id=:new.jobtitle; -if vcnt=1 then -select jobtitlemark into vleaderjob from hrmjobtitles where id=:new.jobtitle; -end if; - -select count(1) into vcnt from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=:new.id; -if vcnt=1 then -select nvl(field100008,''),nvl(field100007,'') into vleaderst,vleaderlv from cus_fielddata -where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=:new.id; -end if; - -delete from jcl_org_map where ftype=4 and fobjid=:new.id and fdatebegin=vdatebegin; - -update jcl_org_map set fdateend=vdatebegin-1 where ftype=4 and fobjid=:new.id and fdateend>vdatebegin; - - - -select count(1) into vcnt from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=-1 and id=:new.id; -if vcnt=1 then -select nvl(field100002,'') into vstr from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=-1 and id=:new.id; -end if; - - vwz:=Instr(vstr,'_'); - vobjparentid:=to_number(substr(vstr,vwz+1,length(vstr)-vwz)); - vparentid:=vobjparentid+sj; - - if vdelete=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,fisvitual,fdatebegin,fdateend) - values - (:new.id+sk,4,:new.id,:new.id,:new.uuid,0,'行政维度',:new.workcode,:new.lastname,:new.messagerurl, - :new.lastname,:new.jobtitle,vleaderjob,vleaderlv,vleaderst,vparentid,vobjparentid,0,vdatebegin,to_date('2099-12-31','yyyy-mm-dd')); -end if; -end if; -end; -/ - -create or replace trigger cus_fielddata_jclgw after insert or update on cus_fielddata FOR EACH ROW -declare -st int; - sj int; - sk int; - vnumber VARCHAR2(255); - vname VARCHAR2(255); - vleaderimg VARCHAR2(255); - vleadername VARCHAR2(255); - vleaderjobid VARCHAR2(255); - vuuid VARCHAR2(255); - vdatebegin date; - vdelete int; - vleaderjob VARCHAR2(255); - vparentid int; - vobjparentid int; - vleaderst VARCHAR2(255); - vleaderlv VARCHAR2(255); - vstr VARCHAR2(255); - vwz int; - vcnt int; -begin - if :new.field100002!=:old.field100002 then - st:=100000000; - sj:=200000000; - sk:=300000000; - vdatebegin:=to_date(sysdate); - -select count(1) into vcnt from hrmresource where id=:new.id; -if vcnt=1 then -select workcode,lastname,case when status<=3 then 0 else 1 end,messagerurl,lastname,jobtitle,uuid -into vnumber,vname,vdelete,vleaderimg,vleadername,vleaderjobid,vuuid from hrmresource where id=:new.id; -end if; - -select count(1) into vcnt from hrmjobtitles where id=vleaderjobid; -if vcnt=1 then -select jobtitlemark into vleaderjob from hrmjobtitles where id=vleaderjobid; -end if; - -select count(1) into vcnt from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=:new.id; -if vcnt=1 then -select nvl(field100008,''),nvl(field100007,'') into vleaderst,vleaderlv from cus_fielddata -where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=:new.id; -end if; - - vstr:=nvl(:new.field100002,''); - vwz:=Instr(vstr,'_'); - vobjparentid:=to_number(substr(vstr,vwz+1,length(vstr)-vwz)); - vparentid:=vobjparentid+sj; - -delete from jcl_org_map where ftype=4 and fobjid=:new.id and fdatebegin=vdatebegin; -update jcl_org_map set fdateend=vdatebegin-1 where ftype=4 and fobjid=:new.id and fdateend>vdatebegin; -if vdelete=0 then - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,fisvitual,fdatebegin,fdateend) - values - (:new.id+sk,4,:new.id,:new.id,vuuid,0,'行政维度',vnumber,vname,vleaderimg, - vleadername,vleaderjobid,vleaderjob,vleaderlv,vleaderst,vparentid,vobjparentid,0,vdatebegin,to_date('2099-12-31','yyyy-mm-dd')); -end if; -end if; -end; -/ - insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -387,7 +10,7 @@ insert into jcl_org_map fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fplan,fonjob,fisvitual,fdatebegin,fdateend) select a.id,1,a.id,b.id,a.uuid,0,'行政维度',a.comp_no,a.comp_name,a.comp_principal,c.messagerurl, - c.lastname,c.jobtitle,d.jobtitlemark,g.field100007,g.field100008,nvl(parent_company,0),nvl(parent_company,0), + c.lastname,c.jobtitle,d.jobtitlemark,g.job_level,g.job_grade,nvl(parent_company,0),nvl(parent_company,0), nvl(e.fcnt,0),nvl(f.fcnt,0),0,to_date(sysdate),to_date('2099-12-31','yyyy-mm-dd') from JCL_ORG_comp a @@ -400,7 +23,7 @@ from group by comp_id) e on a.id=e.comp_id left join (select subcompanyid1,count(1) fcnt from hrmresource where status<=3 group by subcompanyid1) f on f.subcompanyid1=b.id - left join cus_fielddata g on c.id=g.id and g.scope='HrmCustomFieldByInfoType' and g.scopeid=3 + left join jcl_org_hrmresource g ON c.uuid = g.uuid where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1 / @@ -409,7 +32,7 @@ insert into jcl_org_map fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fplan,fonjob,fisvitual,fdatebegin,fdateend) select a.id+100000000,2,a.id,b.id,a.uuid,0,'行政维度',a.dept_no,a.dept_name,a.dept_principal,c.messagerurl, - c.lastname,c.jobtitle,d.jobtitlemark,g.field100007,g.field100008, + c.lastname,c.jobtitle,d.jobtitlemark,g.job_level,g.job_grade, (case nvl(parent_dept,0) when 0 then parent_comp else parent_dept+100000000 end), (case nvl(parent_dept,0) when 0 then parent_comp else parent_dept end), nvl(e.fcnt,0),nvl(f.fcnt,0),0,to_date(sysdate),to_date('2099-12-31','yyyy-mm-dd') @@ -423,7 +46,7 @@ from where time_start<=to_date(sysdate) and time_end>to_date(sysdate)) group by dept_id) e on a.id=e.dept_id 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 + left join jcl_org_hrmresource g ON c.uuid = g.uuid where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1 / @@ -450,28 +73,17 @@ from JCL_ORG_job a where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1 / -delete from cus_fielddata where scopeid=-1 -/ -insert into cus_fielddata(scope, scopeid, id, field100002) -select 'HrmCustomFieldByInfoType',-1,a.id,'199_'||to_char(e.id) -from hrmresource a - 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 -/ - insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleaderimg, fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fisvitual,fdatebegin,fdateend) -select a.id+300000000,4,a.id,a.id,a.uuid,0,'行政维度',a.workcode,a.lastname,a.messagerurl,a.jobtitle, - b.jobtitlemark,c.field100007,c.field100008, - to_number(substr(nvl(field100002,''),instr(nvl(field100002,''),'_')+1,length(nvl(field100002,''))-instr(nvl(field100002,''),'_')))+200000000, - to_number(substr(nvl(field100002,''),instr(nvl(field100002,''),'_')+1,length(nvl(field100002,''))-instr(nvl(field100002,''),'_'))), +select a.id+300000000,4,a.id,a.id,a.uuid,0,'行政维度',a.work_code,a.last_name,c.messagerurl,b.id , + b.job_name,a.job_level,a.job_grade, + to_number(nvl(b.id,''))+200000000, + to_number(nvl(b.id,'')), 0,to_date(sysdate),to_date('2099-12-31','yyyy-mm-dd') -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 +from jcl_org_hrmresource a + left join jcl_org_job b ON a.job_title = b.id + left join hrmresource c on a.uuid = c.uuid where a.status<4 / \ No newline at end of file diff --git a/docs/脚本/Oracle/表结构、初始化数据Oracle.sql b/docs/脚本/Oracle/表结构、初始化数据Oracle.sql index 510e4dd6..d9c0fda2 100644 --- a/docs/脚本/Oracle/表结构、初始化数据Oracle.sql +++ b/docs/脚本/Oracle/表结构、初始化数据Oracle.sql @@ -104,6 +104,7 @@ CREATE TABLE JCL_ORG_COMP ( COMP_NAME NVARCHAR2(100) NULL, COMP_NAME_SHORT NVARCHAR2(100) NULL, PARENT_COMPANY NUMBER NULL, + EC_COMPANY NUMBER NULL, ORG_CODE NVARCHAR2(100) NULL, INDUSTRY NUMBER NULL, COMP_PRINCIPAL NUMBER NULL, @@ -212,7 +213,9 @@ CREATE TABLE JCL_ORG_DEPT ( DEPT_NAME NVARCHAR2(100) NULL, DEPT_NAME_SHORT NVARCHAR2(100) NULL, PARENT_COMP NUMBER NULL, + EC_COMPANY NUMBER NULL, PARENT_DEPT NUMBER NULL, + EC_DEPARTMENT NUMBER NULL, DEPT_PRINCIPAL NUMBER NULL, SHOW_ORDER NUMBER NULL, DESCRIPTION NVARCHAR2(1000) NULL, @@ -427,6 +430,7 @@ CREATE TABLE JCL_ORG_STAFFPLAN ( TIME_START DATE NULL, TIME_END DATE NULL, COMPANY_ID NVARCHAR2(100) NULL, + EC_COMPANY NVARCHAR2(100) NULL, CONTROL_DIMENSION NVARCHAR2(5) NULL, DESCRIPTION NVARCHAR2(1000) NULL, FORBIDDEN_TAG NUMBER NULL, @@ -444,7 +448,9 @@ CREATE TABLE JCL_ORG_STAFF ( ID NUMBER NOT NULL, PLAN_ID NUMBER NULL, COMP_ID NUMBER NULL, + EC_COMPANY NUMBER NULL, DEPT_ID NUMBER NULL, + EC_DEPARTMENT NUMBER NULL, JOB_ID NUMBER NULL, STAFF_NUM NUMBER NULL, CONTROL_POLICY NUMBER NULL, @@ -470,6 +476,7 @@ CREATE TABLE JCL_ORG_STAFFS ( CHANGE_NUM NUMBER NULL, BUSINESS_SOURCE NUMBER NULL, REQUESTID NUMBER NULL, + DESCRIPTION VARCHAR2(200) NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -1006,7 +1013,7 @@ insert INTO jcl_field_extendtitle (id, group_id, title, creator, delete_type, cr 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 (2, 1, 'JCL_ORG_COMP', 'comp_name', '名称', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, SYSDATE, NULL, '1', '["input","text","100"]', 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 (3, 1, 'JCL_ORG_COMP', 'parent_company', '上级公司', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, SYSDATE, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (3, 1, 'JCL_ORG_COMP', 'parent_company', '上级公司', 'int', 3, 1, 1, 0, 0, 0, 0, 0, 1, 6, 1, 0, SYSDATE, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (1, 1, 'JCL_ORG_COMP', 'comp_no', '编号', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, SYSDATE, NULL, '1', '["input","text","100"]', 0) / @@ -1030,9 +1037,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 (13, 2, 'JCL_ORG_DEPT', 'dept_name_short', '简称', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, SYSDATE, NULL, '1', '["input","text","100"]', 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 (14, 2, 'JCL_ORG_DEPT', 'parent_comp', '所属分部', 'int', 3, 2, 1, 1, 1, 1, 1, 1, 1, 4, 1, 0, SYSDATE, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (14, 2, 'JCL_ORG_DEPT', 'parent_comp', '所属分部', 'int', 3, 2, 1, 1, 0, 0, 0, 0, 1, 4, 1, 0, SYSDATE, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (15, 2, 'JCL_ORG_DEPT', 'parent_dept', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, SYSDATE, NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","replaceDatas":[{"showname":"deptBrowser","shownamespan":"deptBrowser","namespan":"部门浏览按钮","name":"部门浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","id":"deptBrowser","randomFieldId":"deptBrowser"}],"value":"deptBrowser"}]', 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 (15, 2, 'JCL_ORG_DEPT', 'parent_dept', '上级部门', 'int', 3, 2, 1, 0, 0, 0, 0, 0, 1, 5, 1, 0, SYSDATE, NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","replaceDatas":[{"showname":"deptBrowser","shownamespan":"deptBrowser","namespan":"部门浏览按钮","name":"部门浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","id":"deptBrowser","randomFieldId":"deptBrowser"}],"value":"deptBrowser"}]', 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 (16, 2, 'JCL_ORG_DEPT', 'dept_principal', '部门负责人', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, SYSDATE, NULL, '1', NULL, 0) / @@ -1060,7 +1067,7 @@ insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, fiel / 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, SYSDATE, 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, SYSDATE, 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 (29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 0, 0, 0, 1, 4, 1, 0, SYSDATE, 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, 3, 1, 0, SYSDATE, NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"itemorderid":"161","name":"自定义单选","id":"161","parenttitle":"集成","title":"集成-自定义单选"}],"value":"161"},{"valueSpan":"职级浏览按钮","replaceDatas":[{"showname":"gradeBrowser","name":"职级浏览按钮","id":"gradeBrowser"}],"value":"gradeBrowser"}]', 0) / @@ -1203,4 +1210,10 @@ insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, fiel 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 (99, 4, 'JCL_ORG_HRMRESOURCE', 'work_year', '工龄', 'decimal(15,2)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 53, 1, 0, SYSDATE, NULL, '3', '["input","float","2"]', 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 (100, 4, 'JCL_ORG_HRMRESOURCE', 'company_work_year', '司龄', 'decimal(15,2)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 54, 1, 0, SYSDATE, NULL, '3', '["input","float","2"]', 0) -/ \ No newline at end of file +/ +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 (101, 1, 'JCL_ORG_COMP', 'ec_company', '上级公司', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, SYSDATE, 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 (102, 2, 'JCL_ORG_DEPT', 'ec_company', '所属分部', 'int', 3, 2, 1, 1, 1, 1, 1, 1, 1, 4, 1, 0, SYSDATE, 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 (103, 2, 'JCL_ORG_DEPT', 'ec_department', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, SYSDATE, NULL, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0) +/ diff --git a/docs/脚本/SqlServer/浏览按钮sqlserver.sql b/docs/脚本/SqlServer/浏览按钮sqlserver.sql index dfdda47c..690f01d7 100644 --- a/docs/脚本/SqlServer/浏览按钮sqlserver.sql +++ b/docs/脚本/SqlServer/浏览按钮sqlserver.sql @@ -58,8 +58,8 @@ select @current_time = CONVERT(varchar(100), GETDATE(), 24) INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('PostInfoBrowser', '1', '1', '', 'select * from jcl_org_post_info where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职务信息浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', @current_date, @current_time, NULL, NULL, '', '', '0', newid(), '', '', '', '', '1', 0, 1) set @datashowset_id = (select max(id) from datashowset) INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('PostInfoBrowser', '0', 0, @current_date, @current_time, NULL, NULL) -INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'post_info_no', '', 1, 1, newid(), NULL) -INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_info_name', '', 0, 2, newid(), NULL) +INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'post_info_no', '', 0, 1, newid(), NULL) +INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_info_name', '', 1, 2, newid(), NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '职务分类', 'post_id', 'select post_name from jcl_org_post where id = {?currentvalue}', 0, 3, newid(), NULL) INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'post_info_no', '2', '', 1, newid(), '') INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'post_info_name', '2', '', 2, newid(), '') @@ -160,7 +160,7 @@ declare @current_time varchar(100) select @current_date = CONVERT(varchar(100), GETDATE(), 23) select @current_time = CONVERT(varchar(100), GETDATE(), 24) INSERT INTO WF_BROWSER_CONFIG(TYPE,CLAZZ,DESCRIPTION,TITELEBEL) VALUES ('666','com.api.browser.service.impl.JobBrowserService','聚才林岗位管理',538781) -INSERT INTO WORKFLOW_BROWSERURL(ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME, COLUMNAME, KEYCOLUMNAME, LINKURL, TYPEID, USEABLE, ORDERID) VALUES ( '666', '538781', 'varchar(4000)','/systeminfo/BrowserMain.jsp?url=','jcl_org_job', 'job_name', 'id', '/spa/organization/static/index.html#/main/organization/jobExtend/', '8', '1', '0' ) +INSERT INTO WORKFLOW_BROWSERURL(ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME, COLUMNAME, KEYCOLUMNAME, LINKURL, TYPEID, USEABLE, ORDERID) VALUES ( '666', '538781', 'varchar(4000)','/systeminfo/BrowserMain.jsp?url=','jcl_org_job', 'job_name', 'id', '/spa/organization/static/index.html#/main/organization/jobExtend/', '8', '2', '0' ) INSERT INTO WORKFLOW_BROWSERURL_MODULE(BROWSERID,MODULECODE)VALUES('666','workflow') GO diff --git a/docs/脚本/SqlServer/组织架构图触发器.sql b/docs/脚本/SqlServer/组织架构图触发器.sql index cef7bc76..28d78dc7 100644 --- a/docs/脚本/SqlServer/组织架构图触发器.sql +++ b/docs/脚本/SqlServer/组织架构图触发器.sql @@ -1,687 +1,9 @@ - - -create trigger HrmCompany_ed on HrmCompany after update as - - if update(companyname) - begin - declare @ftype int - declare @id int - declare @fobjid int - declare @fecid int - declare @uuid varchar(100) - declare @fclass int - declare @fclassname varchar(100) - declare @fnumber varchar(100) - declare @fname varchar(255) - declare @fleader int - declare @fleaderimg varchar(255) - declare @fleadername varchar(100) - declare @fleaderjobid int - declare @fleaderjob varchar(255) - declare @fleaderlv varchar(100) - declare @fleaderst varchar(100) - declare @fparentid int - declare @fobjparentid int - declare @fplan int - declare @fonjob int - declare @fisvitual int - declare @fdatebegin date - declare @fdateend date - - - set @id=0 - - - set @ftype=0 - - - set @fobjid=0 - - - select @fecid=id,@uuid=uuid,@fnumber='00',@fname=companyname from inserted - - - set @fclass=0 - set @fclassname='行政维度' - - - - select @fleader=cast(fvalue as int) from jcl_info where id=1 - - select @fleaderimg=messagerurl,@fleadername=lastname,@fleaderjobid=jobtitle - from hrmresource where id=@fleader - - select @fleaderjob=jobtitlemark from hrmjobtitles where id=@fleaderjobid - - - select @fleaderst=isnull(field100008,''),@fleaderlv=isnull(field100007,'') from cus_fielddata - where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=@fleader - - - set @fparentid=-1 - - - set @fobjparentid=0 - - - select @fdatebegin=cast(GETDATE() as date) - - - set @fdateend='2099-12-31' - - - select @fplan=sum(isnull(staff_num,0)) from JCL_ORG_STAFF - where plan_id in (select id from JCL_ORG_STAFFPLAN - where time_start<=@fdatebegin and time_end>=@fdatebegin) - - - select @fonjob=count(1) from hrmresource where status<=3 - - - set @fisvitual=0 - - - delete from jcl_org_map where fobjid=0 and fdatebegin=@fdatebegin - - - update jcl_org_map set fdateend=dateadd(day,-1,@fdatebegin) - where fobjid=0 and fdateend>@fdatebegin - - insert into jcl_org_map - (id,ftype,fobjid,fecid,Uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, - @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, - @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - end -go - - -create trigger JCL_ORG_COMP_ed on JCL_ORG_COMP after update,insert as - - if update(comp_name) or update(comp_principal) or update(parent_company) or update(forbidden_tag) - begin - declare @ftype int - declare @id int - declare @fobjid int - declare @fecid int - declare @uuid varchar(100) - declare @fclass int - declare @fclassname varchar(100) - declare @fnumber varchar(100) - declare @fname varchar(255) - declare @fleader int - - declare @fleaderimg varchar(255) - declare @fleadername varchar(100) - declare @fleaderjobid int - declare @fleaderjob varchar(255) - declare @fleaderlv varchar(100) - declare @fleaderst varchar(100) - declare @fparentid int - declare @fobjparentid int - declare @fplan int - declare @fonjob int - declare @fisvitual int - declare @fdatebegin date - declare @fdateend date - declare @delete int - - set @ftype=1 - - - select @fobjid=id,@id=id,@uuid=uuid,@fnumber=comp_no,@fname=comp_name, - @fleader=comp_principal,@fparentid=isnull(parent_company,0), - @fobjparentid=isnull(parent_company,0),@delete=isnull(forbidden_tag,0) - from inserted - - - select @fecid=id from HrmSubCompany where uuid=@uuid - - - set @fclass=0 - set @fclassname='行政维度' - - - select @fleaderimg=messagerurl,@fleadername=lastname,@fleaderjobid=jobtitle - from hrmresource where id=@fleader - - select @fleaderjob=jobtitlemark from hrmjobtitles where id=@fleaderjobid - - - select @fleaderst=isnull(field100008,''),@fleaderlv=isnull(field100007,'') from cus_fielddata - where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=@fleader - - - select @fdatebegin=cast(GETDATE() as date) - - - set @fdateend='2099-12-31' - - - select @fplan=sum(isnull(staff_num,0)) from JCL_ORG_STAFF - where plan_id in (select id from JCL_ORG_STAFFPLAN - where time_start<=@fdatebegin and time_end>=@fdatebegin) - and comp_id=@fobjid; - - - select @fonjob=count(1) from hrmresource where status<=3 and subcompanyid1=@fecid - - - set @fisvitual=0 - SET NOCOUNT ON - - 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 - - - if @delete=0 - begin - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, - @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, - @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - end - SET NOCOUNT OFF - end -go - -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 - - set @ftype=1 - 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=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 - end - end -go - - - - -create trigger JCL_ORG_dept_ed on JCL_ORG_dept after update,insert as - - if update(dept_name) or update(dept_principal) or update(parent_comp) or update(parent_dept) or update(forbidden_tag) - begin - declare @ftype int - declare @id int - declare @fobjid int - declare @fecid int - declare @uuid varchar(100) - declare @fclass int - declare @fclassname varchar(100) - declare @fnumber varchar(100) - declare @fname varchar(255) - declare @fleader int - - declare @fleaderimg varchar(255) - declare @fleadername varchar(100) - declare @fleaderjobid int - declare @fleaderjob varchar(255) - declare @fleaderlv varchar(100) - declare @fleaderst varchar(100) - declare @fparentid int - declare @fobjparentid int - declare @fplan int - declare @fonjob int - declare @fisvitual int - declare @fdatebegin date - declare @fdateend date - declare @delete int - - declare @st int - - set @st=100000000 - - set @ftype=2 - - - select @fobjid=id,@id=id+@st,@uuid=uuid,@fnumber=dept_no,@fname=dept_name, - @fleader=dept_principal, - @fparentid=(case isnull(parent_dept,0) when 0 then parent_comp else parent_dept+@st end), - @fobjparentid=(case isnull(parent_dept,0) when 0 then parent_comp else parent_dept end), - @delete=isnull(forbidden_tag,0) - from inserted - - - select @fecid=id from HrmDepartment where uuid=@uuid - - set @fclass=0 - set @fclassname='行政维度' - - - select @fleaderimg=messagerurl,@fleadername=lastname,@fleaderjobid=jobtitle - from hrmresource where id=@fleader - - select @fleaderjob=jobtitlemark from hrmjobtitles where id=@fleaderjobid - - - select @fleaderst=isnull(field100008,''),@fleaderlv=isnull(field100007,'') from cus_fielddata - where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=@fleader - - - select @fdatebegin=cast(GETDATE() as date) - - - set @fdateend='2099-12-31' - - - select @fplan=sum(isnull(staff_num,0)) from JCL_ORG_STAFF - where plan_id in (select id from JCL_ORG_STAFFPLAN - where time_start<=@fdatebegin and time_end>=@fdatebegin) - and dept_id=@fobjid - - - select @fonjob=count(1) from hrmresource where status<=3 and departmentid=@fecid - - - set @fisvitual=0 - SET NOCOUNT ON - - delete from jcl_org_map where ftype=2 and fobjid=@fobjid and fdatebegin=@fdatebegin - - - update jcl_org_map set fdateend=dateadd(day,-1,@fdatebegin) - where ftype=2 and fobjid=@fobjid and fdateend>@fdatebegin - - - if @delete=0 - begin - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, - @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, - @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - end - SET NOCOUNT OFF - end -go - -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 - - - -create trigger JCL_ORG_job_ed on JCL_ORG_job after update,insert as - - if update(job_name) or update(parent_dept) or update(parent_job) or update(forbidden_tag) - begin - declare @ftype int - declare @id int - declare @fobjid int - declare @fecid int - declare @uuid varchar(100) - declare @fclass int - declare @fclassname varchar(100) - declare @fnumber varchar(100) - declare @fname varchar(255) - declare @fleader int - - declare @fleaderimg varchar(255) - declare @fleadername varchar(100) - declare @fleaderjobid int - declare @fleaderjob varchar(255) - declare @fleaderlv varchar(100) - declare @fleaderst varchar(100) - declare @fparentid int - declare @fobjparentid int - declare @fplan int - declare @fonjob int - declare @fisvitual int - declare @fdatebegin date - declare @fdateend date - declare @delete int - declare @parentdept int - - declare @st int - - set @st=100000000 - - declare @sj int - - set @sj=200000000 - - - set @ftype=3 - - - select @fobjid=id,@id=id+@sj,@fnumber=job_no,@fname=job_name, - @fparentid=(case isnull(parent_job,0) when 0 then parent_dept+@st else parent_job+@sj end), - @fobjparentid=(case isnull(parent_job,0) when 0 then parent_dept else parent_job end), - @delete=isnull(forbidden_tag,0),@parentdept=parent_dept - from inserted - - - set @fclass=0 - set @fclassname='行政维度' - - - select @fdatebegin=cast(GETDATE() as date) - - - set @fdateend='2099-12-31' - - - select @fplan=sum(isnull(staff_num,0)) from JCL_ORG_STAFF - where plan_id in (select id from JCL_ORG_STAFFPLAN - where time_start<=@fdatebegin and time_end>=@fdatebegin) - and job_id=@fobjid - - - select @fonjob=count(1) from hrmresource where status<=3 - and departmentid=(select id from hrmdepartment where uuid=(select uuid from JCL_ORG_DEPT where id=@parentdept)) - and jobtitle in (select id from hrmjobtitles where JOBTITLENAME=@fname); - - - set @fisvitual=0 - SET NOCOUNT ON - - 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 - - - if @delete=0 - begin - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, - @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, - @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - end - SET NOCOUNT OFF - end -go - -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 - - - -create trigger hrmresource_ed on hrmresource after update,insert as - - if update(lastname) or update(status) - begin - declare @ftype int - declare @id int - declare @fobjid int - declare @fecid int - declare @uuid varchar(100) - declare @fclass int - declare @fclassname varchar(100) - declare @fnumber varchar(100) - declare @fname varchar(255) - declare @fleader int - - declare @fleaderimg varchar(255) - declare @fleadername varchar(100) - declare @fleaderjobid int - declare @fleaderjob varchar(255) - declare @fleaderlv varchar(100) - declare @fleaderst varchar(100) - declare @fparentid int - declare @fobjparentid int - declare @fplan int - declare @fonjob int - declare @fisvitual int - declare @fdatebegin date - declare @fdateend date - declare @delete int - declare @wz int - declare @str varchar(100) - - - declare @st int - - set @st=100000000 - - declare @sj int - - set @sj=200000000 - - declare @sk int - - set @sk=300000000 - - - set @ftype=4 - - - select @fobjid=id,@id=id+@sk,@fnumber=workcode,@fname=lastname, - @delete=case when status<=3 then 0 else 1 end, - @fleaderimg=messagerurl,@fleadername=lastname,@fleaderjobid=jobtitle - from inserted - - - select @str=isnull(field100002,'') - from cus_fielddata where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=@fobjid - set @wz=charindex('_',@str) - set @fobjparentid=cast(right(@str,len(@str)-@wz) as int) - set @fparentid=@fobjparentid+@sj - - - set @fclass=0 - set @fclassname='行政维度' - - select @fleaderjob=jobtitlemark from hrmjobtitles where id=@fleaderjobid - - - select @fleaderst=isnull(field100008,''),@fleaderlv=isnull(field100007,'') from cus_fielddata - where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=@fobjid - - - select @fdatebegin=cast(GETDATE() as date) - - - set @fdateend='2099-12-31' - - - set @fisvitual=0 - - - 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 - - - if @delete=0 - begin - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, - @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, - @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - end - end -go - - -create trigger cus_fielddata_jclgw on cus_fielddata after update as - - if update(field100002) - - begin - declare @ftype int - declare @id int - declare @fobjid int - declare @fecid int - declare @uuid varchar(100) - declare @fclass int - declare @fclassname varchar(100) - declare @fnumber varchar(100) - declare @fname varchar(255) - declare @fleader int - - declare @fleaderimg varchar(255) - declare @fleadername varchar(100) - declare @fleaderjobid int - declare @fleaderjob varchar(255) - declare @fleaderlv varchar(100) - declare @fleaderst varchar(100) - declare @fparentid int - declare @fobjparentid int - declare @fplan int - declare @fonjob int - declare @fisvitual int - declare @fdatebegin date - declare @fdateend date - declare @delete int - declare @wz int - declare @str varchar(100) - - declare @st int - - set @st=100000000 - - declare @sj int - - set @sj=200000000 - - declare @sk int - - set @sk=300000000 - - - set @ftype=4 - - - select @fobjid=id,@id=id+@sk,@str=isnull(field100002,'') from inserted - - select @fnumber=workcode,@fname=lastname, - @delete=case when status<=3 then 0 else 1 end, - @fleaderimg=messagerurl,@fleadername=lastname,@fleaderjobid=jobtitle - from hrmresource where id=@fobjid - - - set @wz=charindex('_',@str) - set @fobjparentid=cast(right(@str,len(@str)-@wz) as int) - set @fparentid=@fobjparentid+@sj - - set @fclass=0 - set @fclassname='行政维度' - - select @fleaderjob=jobtitlemark from hrmjobtitles where id=@fleaderjobid - - - select @fleaderst=isnull(field100008,''),@fleaderlv=isnull(field100007,'') from cus_fielddata - where scope='HrmCustomFieldByInfoType' and scopeid=3 and id=@fobjid - - - select @fdatebegin=cast(GETDATE() as date) - - - set @fdateend='2099-12-31' - - - set @fisvitual=0 - - - 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 - - - if @delete=0 - begin - insert into jcl_org_map - (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, - fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, - fplan,fonjob,fisvitual,fdatebegin,fdateend) - values - (@id,@ftype,@fobjid,@fecid,@uuid,@fclass,@fclassname,@fnumber,@fname,@fleader,@fleaderimg, - @fleadername,@fleaderjobid,@fleaderjob,@fleaderlv,@fleaderst,@fparentid,@fobjparentid, - @fplan,@fonjob,@fisvitual,@fdatebegin,@fdateend) - end - end -go - - insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fplan,fonjob,fisvitual,fdatebegin,fdateend) select a.id,1,a.id,b.id,a.uuid,0,'行政维度',a.comp_no,a.comp_name,a.comp_principal,c.messagerurl, - c.lastname,c.jobtitle,d.jobtitlemark,g.field100007,g.field100008,isnull(parent_company,0),isnull(parent_company,0), + c.lastname,c.jobtitle,d.jobtitlemark,g.job_level,g.job_grade,isnull(parent_company,0),isnull(parent_company,0), isnull(e.fcnt,0),isnull(f.fcnt,0),0,cast(GETDATE() as date),'2099-12-31' from JCL_ORG_comp as a @@ -694,7 +16,7 @@ left join (select comp_id,sum(isnull(staff_num,0)) fcnt from JCL_ORG_STAFF group by comp_id) e on a.id=e.comp_id left join (select subcompanyid1,count(1) fcnt from hrmresource where status<=3 group by subcompanyid1) f on f.subcompanyid1=b.id -left join cus_fielddata g on c.id=g.id and g.scope='HrmCustomFieldByInfoType' and g.scopeid=3 +left join jcl_org_hrmresource g ON c.uuid = g.uuid where isnull(a.delete_type,0) <>1 and isnull(a.forbidden_tag,0) <>1 go @@ -705,7 +27,7 @@ fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fplan,fonjob,fisvitual,fdatebegin,fdateend) select a.id+100000000,2,a.id,b.id,a.uuid,0,'行政维度',a.dept_no,a.dept_name,a.dept_principal,c.messagerurl, - c.lastname,c.jobtitle,d.jobtitlemark,g.field100007,g.field100008, + c.lastname,c.jobtitle,d.jobtitlemark,g.job_level,g.job_grade, (case isnull(parent_dept,0) when 0 then parent_comp else parent_dept+100000000 end), (case isnull(parent_dept,0) when 0 then parent_comp else parent_dept end), isnull(e.fcnt,0),isnull(f.fcnt,0),0,cast(GETDATE() as date),'2099-12-31' @@ -719,7 +41,7 @@ left join (select dept_id,sum(isnull(staff_num,0)) fcnt from JCL_ORG_STAFF where time_start<=cast(GETDATE() as date) and time_end>cast(GETDATE() as date)) group by dept_id) e on a.id=e.dept_id 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 +left join jcl_org_hrmresource g ON c.uuid = g.uuid where isnull(a.delete_type,0) <>1 and isnull(a.forbidden_tag,0) <>1 go @@ -747,31 +69,18 @@ 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 go - -delete from cus_fielddata where scopeid=-1 -go -insert into cus_fielddata(scope, scopeid, id, field100002) -select 'HrmCustomFieldByInfoType',-1,a.id,'199_'+cast(e.id as varchar(10)) -from hrmresource a -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 -go - - insert into jcl_org_map (id,ftype,fobjid,fecid,uuid,fclass,fclassname,fnumber,fname,fleaderimg, fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, fisvitual,fdatebegin,fdateend) -select a.id+300000000,4,a.id,a.id,a.uuid,0,'行政维度',a.workcode,a.lastname,a.messagerurl,a.jobtitle, - b.jobtitlemark,c.field100007,c.field100008, - cast(right(isnull(field100002,''),len(isnull(field100002,''))-charindex('_',isnull(field100002,''))) as int)+200000000, - cast(right(isnull(field100002,''),len(isnull(field100002,''))-charindex('_',isnull(field100002,''))) as int), +select a.id+300000000,4,a.id,a.id,a.uuid,0,'行政维度',a.work_code,a.last_name,c.messagerurl,b.id, + b.job_name,a.job_level,a.job_grade, + cast(isnull(b.id,'') as int)+200000000, + cast(isnull(b.id,'') as int), 0,cast(GETDATE() as date),'2099-12-31' -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 +from jcl_org_hrmresource a +left join jcl_org_job b on a.job_title = b.id +left join hrmresource c on a.uuid = c.uuid where a.status<4 GO diff --git a/docs/脚本/SqlServer/表结构、基础数据.sql b/docs/脚本/SqlServer/表结构、基础数据.sql index df806b9b..912082b4 100644 --- a/docs/脚本/SqlServer/表结构、基础数据.sql +++ b/docs/脚本/SqlServer/表结构、基础数据.sql @@ -109,6 +109,7 @@ CREATE TABLE [dbo].[JCL_ORG_COMP] ( [comp_name] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [comp_name_short] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [parent_company] int NULL, + [ec_company] int NULL, [org_code] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [industry] int NULL, [comp_principal] int NULL, @@ -170,7 +171,9 @@ CREATE TABLE [dbo].[JCL_ORG_DEPT] ( [dept_name] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [dept_name_short] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [parent_comp] int NULL, + [ec_company] int NULL, [parent_dept] int NULL, + [ec_department] int NULL, [dept_principal] int NULL, [show_order] int NULL, [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, @@ -350,7 +353,7 @@ GO CREATE TABLE [dbo].[JCL_ORG_HRMRESOURCEEXT] ( - [id] int IDENTITY(1,1) NOT NULL, + [id] int NOT NULL, [creator] int NULL, [delete_type] int NULL, [create_time] datetime NULL, @@ -589,7 +592,9 @@ CREATE TABLE [dbo].[JCL_ORG_STAFF] ( [id] int IDENTITY(1,1) NOT NULL, [plan_id] int NULL, [comp_id] int NULL, + [ec_company] int NULL, [dept_id] int NULL, + [ec_department] int NULL, [job_id] int NULL, [staff_num] int NULL, [control_policy] int NULL, @@ -621,6 +626,7 @@ CREATE TABLE [dbo].[JCL_ORG_STAFFPLAN] ( [time_start] datetime NULL, [time_end] datetime NULL, [company_id] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, + [ec_company] varchar(100) COLLATE Chinese_PRC_CI_AS NULL, [control_dimension] varchar(5) COLLATE Chinese_PRC_CI_AS NULL, [description] varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, [forbidden_tag] int NULL, @@ -646,6 +652,7 @@ CREATE TABLE [dbo].[JCL_ORG_STAFFS] ( [change_num] int NULL, [business_source] int NULL, [requestid] int NULL, + [description] varchar(200) NULL, [creator] int NULL, [delete_type] int NULL, [create_time] datetime NULL, @@ -955,7 +962,7 @@ GO set IDENTITY_INSERT JCL_FIELD_EXTENDINFO ON 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 (2, 1, 'JCL_ORG_COMP', 'comp_name', '名称', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, GETDATE(), NULL, '1', '["input","text","100"]', 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 (3, 1, 'JCL_ORG_COMP', 'parent_company', '上级公司', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, GETDATE(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (3, 1, 'JCL_ORG_COMP', 'parent_company', '上级公司', 'int', 3, 1, 1, 0, 0, 0, 0, 0, 1, 6, 1, 0, GETDATE(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (1, 1, 'JCL_ORG_COMP', 'comp_no', '编号', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, GETDATE(), NULL, '1', '["input","text","100"]', 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 (4, 1, 'JCL_ORG_COMP', 'industry', '行业', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 8, 1, 0, GETDATE(), NULL, '63', 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 (5, 1, 'JCL_ORG_COMP', 'comp_name_short', '简称', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 0, GETDATE(), NULL, '1', '["input","text","100"]', 0) @@ -967,8 +974,8 @@ GO 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 (11, 2, 'JCL_ORG_DEPT', 'dept_no', '编号', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, GETDATE(), NULL, '1', '["input","text","100"]', 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 (12, 2, 'JCL_ORG_DEPT', 'dept_name', '名称', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, GETDATE(), NULL, '1', '["input","text","100"]', 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 (13, 2, 'JCL_ORG_DEPT', 'dept_name_short', '简称', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, GETDATE(), NULL, '1', '["input","text","100"]', 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 (14, 2, 'JCL_ORG_DEPT', 'parent_comp', '所属分部', 'int', 3, 2, 1, 1, 1, 1, 1, 1, 1, 4, 1, 0, GETDATE(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (15, 2, 'JCL_ORG_DEPT', 'parent_dept', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, GETDATE(), NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","replaceDatas":[{"showname":"deptBrowser","shownamespan":"deptBrowser","namespan":"部门浏览按钮","name":"部门浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","id":"deptBrowser","randomFieldId":"deptBrowser"}],"value":"deptBrowser"}]', 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 (14, 2, 'JCL_ORG_DEPT', 'parent_comp', '所属分部', 'int', 3, 2, 1, 1, 0, 0, 0, 0, 1, 4, 1, 0, GETDATE(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"compBrowser","valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","shownamespan":"compBrowser","namespan":"公司分部浏览按钮","name":"公司分部浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"compBrowser","id":"compBrowser"}]}]', 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 (15, 2, 'JCL_ORG_DEPT', 'parent_dept', '上级部门', 'int', 3, 2, 1, 0, 0, 0, 0, 0, 1, 5, 1, 0, GETDATE(), NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"部门浏览按钮","replaceDatas":[{"showname":"deptBrowser","shownamespan":"deptBrowser","namespan":"部门浏览按钮","name":"部门浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","id":"deptBrowser","randomFieldId":"deptBrowser"}],"value":"deptBrowser"}]', 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 (16, 2, 'JCL_ORG_DEPT', 'dept_principal', '部门负责人', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, GETDATE(), NULL, '1', 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 (17, 2, 'JCL_ORG_DEPT', 'show_order', '显示顺序', 'int', 1, 2, 1, 0, 1, 1, 1, 1, 1, 7, 1, 0, GETDATE(), NULL, '2', 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 (18, 2, 'JCL_ORG_DEPT', 'description', '说明', 'text', 2, 2, 1, 0, 1, 1, 1, 0, 1, 8, 1, 0, GETDATE(), NULL, NULL, NULL, 0) @@ -982,7 +989,7 @@ GO 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, 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 (29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 0, 0, 0, 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, 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) @@ -1054,7 +1061,11 @@ GO 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 (98, 4, 'JCL_ORG_HRMRESOURCE', 'classification', '人员密级', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 52, 1, 0, GETDATE(), NULL, '2', '["input","int"]', 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 (99, 4, 'JCL_ORG_HRMRESOURCE', 'work_year', '工龄', 'decimal(15,2)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 53, 1, 0, GETDATE(), NULL, '3', '["input","float","2"]', 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 (100, 4, 'JCL_ORG_HRMRESOURCE', 'company_work_year', '司龄', 'decimal(15,2)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 54, 1, 0, GETDATE(), NULL, '3', '["input","float","2"]', 0) - set IDENTITY_INSERT JCL_FIELD_EXTENDINFO OFF + 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 (101, 1, 'JCL_ORG_COMP', 'ec_company', '上级公司', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 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 (102, 2, 'JCL_ORG_DEPT', 'ec_company', '所属分部', 'int', 3, 2, 1, 1, 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 (103, 2, 'JCL_ORG_DEPT', 'ec_department', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, GETDATE(), NULL, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0) + +set IDENTITY_INSERT JCL_FIELD_EXTENDINFO OFF GO diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 67d1eb68..ca8be925 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -543,4 +543,18 @@ create table JCL_ORG_ITEM ( create_time date null, update_time date null, constraint JCL_ORG_ITEM_PK primary key (fid) +); + +-- JCL_ORG_DETACH +create table JCL_ORG_DETACH ( + id int auto_increment not null, + type int null, + manger text not null, + rolelevel text not null, + module text not null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + constraint JCL_ORG_DETACH_PK primary key (id) ); \ No newline at end of file diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 0e21f185..fd026eb8 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -486,3 +486,19 @@ CREATE TABLE JCL_ORG_HRMRELATION ( UPDATE_TIME DATE NULL, CONSTRAINT JCL_ORG_HRMRELATION_PK PRIMARY KEY (ID) ); + +-- JCL_ORG_DETACH +create table JCL_ORG_DETACH ( + id number not null, + type number null, + manger clob not null, + rolelevel clob not null, + module clob not null, + creator number null, + delete_type number null, + create_time date null, + update_time date null, + constraint JCL_ORG_DETACH_PK primary key (id) +); + + diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index e8cb725d..0cddf6f5 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -516,4 +516,18 @@ CREATE TABLE JCL_ORG_MAP ( create_time date null, update_time date null, CONSTRAINT JCL_ORG_MAP_PK PRIMARY KEY (id) +); + +-- JCL_ORG_DETACH +create table JCL_ORG_DETACH ( + id int IDENTITY(1,1) not null, + type int null, + manger text not null, + rolelevel text not null, + module text not null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + constraint JCL_ORG_DETACH_PK primary key (id) ); \ No newline at end of file diff --git a/docs/非标从发SQL脚本/MySQL.sql b/docs/非标从发SQL脚本/MySQL.sql new file mode 100644 index 00000000..115eb664 --- /dev/null +++ b/docs/非标从发SQL脚本/MySQL.sql @@ -0,0 +1,68 @@ +-- 更新表结构 +alter table JCL_ORG_COMP add ec_company int; +alter table JCL_ORG_DEPT add ec_company int; +alter table JCL_ORG_DEPT add ec_department int; +alter table jcl_org_staffplan add ec_company varchar(100); +alter table jcl_org_staff add ec_company int; +alter table jcl_org_staff add ec_department int; +alter table JCL_ORG_STAFFS add description varchar(200); +-- 插入自定义信息 +insert INTO jcl_field_extendinfo (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 (1, 'JCL_ORG_COMP', 'ec_company', '上级公司', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, now(), NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0); +insert INTO jcl_field_extendinfo (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 (2, 'JCL_ORG_DEPT', 'ec_company', '所属分部', 'int', 3, 2, 1, 1, 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 (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 (2, 'JCL_ORG_DEPT', 'ec_department', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, now(), NULL, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0); + +-- 更新自定义字段信息 +update jcl_field_extendinfo set list_show =0,search_show =0,edit_show =0,add_show =0 where table_name ='JCL_ORG_COMP' and field_name ='parent_company'; +update jcl_field_extendinfo set list_show =0,search_show =0,edit_show =0,add_show =0 where table_name ='JCL_ORG_DEPT' and field_name ='parent_comp'; +update jcl_field_extendinfo set list_show =0,search_show =0,edit_show =0,add_show =0 where table_name ='JCL_ORG_DEPT' and field_name ='parent_dept'; +update jcl_field_extendinfo set search_show=0,edit_show=0,add_show=0 where table_name ='JCL_ORG_JOB' and field_name='ec_company'; + +-- 更新浏览按钮 +update WORKFLOW_BROWSERURL set TYPEID ='2' where ID = '666'; +update datashowparam set ISSHOWNAME =0 where SEARCHNAME = 'post_info_no'; +update datashowparam set ISSHOWNAME =1 where SEARCHNAME = 'post_info_name'; + +-- 更新视图 +drop view v_jcl_zdzj; +drop view v_jcl_post; + +create view v_jcl_zdzj as +select concat('A',xl.id) fid,xl.sequence_name fname,'0' fparentid,xl.sequence_no fno,xl.id fobjid,'1' as ftype +from jcl_org_sequence xl + inner join JCL_ORG_GRADE zj on zj.scheme_id=xl.scheme_id and ifnull(zj.forbidden_tag,0)<>1 and ifnull(zj.delete_type,0)<>1 + inner join JCL_ORG_LEVEL zd on zd.scheme_id=zd.scheme_id and ifnull(zd.forbidden_tag,0)<>1 and ifnull(zd.delete_type,0)<>1 +where ifnull(xl.forbidden_tag,0)<>1 and ifnull(xl.delete_type,0)<>1 +union +select concat(xl.id,'A',zj.id),zj.grade_name,concat('A',xl.id),zj.grade_no,zj.id,'2' as ftype +from JCL_ORG_GRADE zj + inner join jcl_org_sequence xl on zj.scheme_id=xl.scheme_id + inner join JCL_ORG_LEVEL zd on concat(',',zj.level_id,',') like concat('%,',zd.id,',%') and ifnull(zd.forbidden_tag,0)<>1 and ifnull(zd.delete_type,0)<>1 +where ifnull(zj.forbidden_tag,0)<>1 and ifnull(zj.delete_type,0)<>1 +union +select concat(xl.id,'A',zj.id,'A',zd.id),zd.level_name,concat(xl.id,'A',zj.id),zd.level_no,zd.id,'3' as ftype +from JCL_ORG_LEVEL zd + inner join JCL_ORG_GRADE zj on concat(',',zj.level_id,',') like concat('%,',zd.id,',%') + inner join jcl_org_sequence xl on zj.scheme_id=xl.scheme_id +where ifnull(zd.forbidden_tag,0)<>1 and ifnull(zd.delete_type,0)<>1; + + +create view v_jcl_post as +select a.id*-1 fid,a.post_name fname,0 fparentid from JCL_ORG_POST a + inner join JCL_ORG_POST_INFO b on a.id =b.post_id and ifnull(b.forbidden_tag,0)<>1 and ifnull(b.delete_type,0)<>1 +where ifnull(a.delete_type,0)<>1 +union +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; + + +--- MySQL +-- 更新分部ec_company +update jcl_org_comp d set ec_company = ( select eccompany from ( select b.id as parent_company, c.id as eccompany from jcl_org_comp a inner join jcl_org_comp b on a.parent_company = b.id inner join hrmsubcompany c on b.uuid = c.uuid group by b.id ) e where d.parent_company = e.parent_company ); +-- 更新部门ec_department、ec_company +update JCL_ORG_DEPT d set ec_department = ( select ecdepartment from ( select b.id as parent_dept, c.id as ecdepartment from JCL_ORG_DEPT a inner join JCL_ORG_DEPT b on a.parent_dept = b.id inner join hrmdepartment c on b.uuid = c.uuid group by b.id ) e where d.parent_dept = e.parent_dept ); +update JCL_ORG_DEPT d set ec_company = ( select eccompany from ( select a.id as id, c.id as eccompany from jcl_org_comp a inner join hrmsubcompany c on a.uuid = c.uuid) e where d.parent_comp = e.id ); +-- 更新人员jobtitle +-- update hrmresource set jobtitle = ( select id from HRMJOBTITLES where JOBTITLENAME = ( select JOB_NAME from jcl_org_job where id = ( select FIELD100002 from CUS_FIELDDATA where scope = 'HrmCustomFieldByInfoType' and SCOPEID = '-1' and CUS_FIELDDATA.ID = hrmresource.ID))); +-- 更新岗位ec_company、ec_department +update jcl_org_job d set ec_company = (select eccompany from ( select a.id as id, c.id as eccompany from jcl_org_comp a inner join hrmsubcompany c on a.uuid = c.uuid) e where d.parent_comp = e.id ); +update jcl_org_job d set ec_department = ( select ec_department from ( select a.id as id, c.id as ec_department from jcl_org_dept a inner join hrmdepartment c on a.uuid = c.uuid) e where d.parent_dept = e.id ); diff --git a/docs/非标从发SQL脚本/Oracle.sql b/docs/非标从发SQL脚本/Oracle.sql new file mode 100644 index 00000000..a7658973 --- /dev/null +++ b/docs/非标从发SQL脚本/Oracle.sql @@ -0,0 +1,65 @@ +-- 更新表结构 +alter table JCL_ORG_COMP add ec_company int; +alter table JCL_ORG_DEPT add ec_company int; +alter table JCL_ORG_DEPT add ec_department int; +alter table jcl_org_staffplan add ec_company varchar(100); +alter table jcl_org_staff add ec_company int; +alter table jcl_org_staff add ec_department int; +alter table JCL_ORG_STAFFS add description varchar(200); +-- 插入自定义信息 +insert INTO jcl_field_extendinfo (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 (1, 'JCL_ORG_COMP', 'ec_company', '上级公司', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, SYSDATE, NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0); +insert INTO jcl_field_extendinfo (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 (2, 'JCL_ORG_DEPT', 'ec_company', '所属分部', 'int', 3, 2, 1, 1, 1, 1, 1, 1, 1, 4, 1, 0, SYSDATE, NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0); +insert INTO jcl_field_extendinfo (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 (2, 'JCL_ORG_DEPT', 'ec_department', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, SYSDATE, NULL, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0); + +-- 更新自定义字段信息 +update jcl_field_extendinfo set list_show =0,search_show =0,edit_show =0,add_show =0 where table_name ='JCL_ORG_COMP' and field_name ='parent_company'; +update jcl_field_extendinfo set list_show =0,search_show =0,edit_show =0,add_show =0 where table_name ='JCL_ORG_DEPT' and field_name ='parent_comp'; +update jcl_field_extendinfo set list_show =0,search_show =0,edit_show =0,add_show =0 where table_name ='JCL_ORG_DEPT' and field_name ='parent_dept'; +update jcl_field_extendinfo set search_show=0,edit_show=0,add_show=0 where table_name ='JCL_ORG_JOB' and field_name='ec_company'; + +-- 更新浏览按钮 +update WORKFLOW_BROWSERURL set TYPEID ='2' where ID = '666'; +update datashowparam set ISSHOWNAME =0 where SEARCHNAME = 'post_info_no'; +update datashowparam set ISSHOWNAME =1 where SEARCHNAME = 'post_info_name'; + +-- 更新视图 +drop view v_jcl_zdzj; +drop view v_jcl_post; + +create or replace view v_jcl_zdzj as +select 'A'||xl.id fid,xl.sequence_name fname,'0' fparentid,xl.sequence_no fno,xl.id fobjid,'1' as ftype +from jcl_org_sequence xl + INNER JOIN JCL_ORG_GRADE zj ON zj.scheme_id=xl.scheme_id AND nvl(zj.forbidden_tag,0)<>1 and nvl(zj.delete_type,0)<>1 + INNER JOIN JCL_ORG_LEVEL zd ON zd.scheme_id=xl.scheme_id AND nvl(zd.forbidden_tag,0)<>1 and nvl(zd.delete_type,0)<>1 +where nvl(xl.forbidden_tag,0)<>1 and nvl(xl.delete_type,0)<>1 +union +select xl.id ||'A'|| zj.id ,zj.grade_name,'A'|| xl.id ,zj.grade_no,zj.id,'2' as ftype +from JCL_ORG_GRADE zj + inner join jcl_org_sequence xl on zj.scheme_id=xl.scheme_id + INNER JOIN JCL_ORG_LEVEL zd on ','|| zj.level_id ||',' like '%,'|| zd.id ||',%' AND nvl(zd.forbidden_tag,0)<>1 and nvl(zd.delete_type,0)<>1 +where nvl(zj.forbidden_tag,0)<>1 and nvl(zj.delete_type,0)<>1 +union +select xl.id ||'A'|| zj.id ||'A'|| zd.id ,zd.level_name, xl.id ||'A'|| zj.id ,zd.level_no,zd.id,'3' as ftype +from JCL_ORG_LEVEL zd + inner join JCL_ORG_GRADE zj on ','|| zj.level_id ||',' like '%,'|| zd.id ||',%' + inner join jcl_org_sequence xl on zj.scheme_id=xl.scheme_id +where nvl(zd.forbidden_tag,0)<>1 and nvl(zd.delete_type,0)<>1; + +create or replace view v_jcl_post as +select a.id*-1 fid,a.post_name fname,0 fparentid from JCL_ORG_POST a + inner join JCL_ORG_POST_INFO b on a.id =b.post_id and nvl(b.forbidden_tag,0)<>1 and nvl(b.delete_type,0)<>1 +where nvl(a.delete_type,0)<>1 +union +select id,post_info_name,post_id*-1 from JCL_ORG_POST_INFO +where nvl(forbidden_tag,0)<>1 and nvl(delete_type,0)<>1; + + +-- SqlServer +-- 更新分部ec_company +update jcl_org_comp set ec_company = ( select eccompany from ( select DISTINCT b.id as parent_company, c.id as eccompany from jcl_org_comp a inner join jcl_org_comp b on a.parent_company = b.id inner join hrmsubcompany c on b.uuid = c.uuid ) e where jcl_org_comp.parent_company = e.parent_company ); +-- 更新部门ec_department、ec_company +update JCL_ORG_DEPT set ec_department = ( select ecdepartment from ( select DISTINCT b.id as parent_dept, c.id as ecdepartment from JCL_ORG_DEPT a inner join JCL_ORG_DEPT b on a.parent_dept = b.id inner join hrmdepartment c on b.uuid = c.uuid ) e where JCL_ORG_DEPT.parent_dept = e.parent_dept ); +update JCL_ORG_DEPT set ec_company = ( select eccompany from ( select a.id as id, c.id as eccompany from jcl_org_comp a inner join hrmsubcompany c on a.uuid = c.uuid) e where JCL_ORG_DEPT.parent_comp = e.id ); +-- 更新岗位ec_company、ec_department +update jcl_org_job set ec_company = (select eccompany from ( select a.id as id, c.id as eccompany from jcl_org_comp a inner join hrmsubcompany c on a.uuid = c.uuid) e where jcl_org_job.parent_comp = e.id ); +update jcl_org_job set ec_department = ( select ec_department from ( select a.id as id, c.id as ec_department from jcl_org_dept a inner join hrmdepartment c on a.uuid = c.uuid) e where jcl_org_job.parent_dept = e.id ); diff --git a/docs/非标从发SQL脚本/SqlServer.sql b/docs/非标从发SQL脚本/SqlServer.sql new file mode 100644 index 00000000..209661b9 --- /dev/null +++ b/docs/非标从发SQL脚本/SqlServer.sql @@ -0,0 +1,66 @@ +-- 更新表结构 +alter table JCL_ORG_COMP add ec_company int; +alter table JCL_ORG_DEPT add ec_company int; +alter table JCL_ORG_DEPT add ec_department int; +alter table jcl_org_staffplan add ec_company varchar(100); +alter table jcl_org_staff add ec_company int; +alter table jcl_org_staff add ec_department int; +alter table JCL_ORG_STAFFS add description varchar(200); +-- 插入自定义信息 +insert INTO jcl_field_extendinfo (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 (1, 'JCL_ORG_COMP', 'ec_company', '上级公司', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, GETDATE(), NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0); +insert INTO jcl_field_extendinfo (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 (2, 'JCL_ORG_DEPT', 'ec_company', '所属分部', 'int', 3, 2, 1, 1, 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 (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 (2, 'JCL_ORG_DEPT', 'ec_department', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, GETDATE(), NULL, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0); + +-- 更新自定义字段信息 +update jcl_field_extendinfo set list_show =0,search_show =0,edit_show =0,add_show =0 where table_name ='JCL_ORG_COMP' and field_name ='parent_company'; +update jcl_field_extendinfo set list_show =0,search_show =0,edit_show =0,add_show =0 where table_name ='JCL_ORG_DEPT' and field_name ='parent_comp'; +update jcl_field_extendinfo set list_show =0,search_show =0,edit_show =0,add_show =0 where table_name ='JCL_ORG_DEPT' and field_name ='parent_dept'; +update jcl_field_extendinfo set search_show=0,edit_show=0,add_show=0 where table_name ='JCL_ORG_JOB' and field_name='ec_company'; + +-- 更新浏览按钮 +update WORKFLOW_BROWSERURL set TYPEID ='2' where ID = '666'; +update datashowparam set ISSHOWNAME =0 where SEARCHNAME = 'post_info_no'; +update datashowparam set ISSHOWNAME =1 where SEARCHNAME = 'post_info_name'; + +-- 更新视图 +drop view v_jcl_zdzj; +drop view v_jcl_post; + +create view v_jcl_zdzj as +select 'A'+cast(xl.id as varchar) fid,xl.sequence_name fname,'0' fparentid,xl.sequence_no fno,xl.id fobjid,'1' as ftype +from jcl_org_sequence xl + inner join JCL_ORG_GRADE zj on zj.scheme_id=xl.scheme_id and isnull(zj.forbidden_tag,0)<>1 and isnull(zj.delete_type,0)<>1 + inner join JCL_ORG_LEVEL zd on zd.scheme_id=xl.scheme_id and isnull(zd.forbidden_tag,0)<>1 and isnull(zd.delete_type,0)<>1 +where isnull(xl.forbidden_tag,0)<>1 and isnull(xl.delete_type,0)<>1 +union +select cast(xl.id as varchar)+'A'+cast(zj.id as varchar),zj.grade_name,'A'+cast(xl.id as varchar),zj.grade_no,zj.id,'2' as ftype +from JCL_ORG_GRADE zj + inner join jcl_org_sequence xl on zj.scheme_id=xl.scheme_id + inner join JCL_ORG_LEVEL zd on ','+cast(zj.level_id as varchar)+',' like '%,'+cast(zd.id as varchar)+',%' and isnull(zd.forbidden_tag,0)<>1 and isnull(zd.delete_type,0)<>1 +where isnull(zj.forbidden_tag,0)<>1 and isnull(zj.delete_type,0)<>1 +union +select cast(xl.id as varchar)+'A'+cast(zj.id as varchar)+'A'+cast(zd.id as varchar),zd.level_name,cast(xl.id as varchar)+'A'+cast(zj.id as varchar),zd.level_no,zd.id,'3' as ftype +from JCL_ORG_LEVEL zd + inner join JCL_ORG_GRADE zj on ','+cast(zj.level_id as varchar)+',' like '%,'+cast(zd.id as varchar)+',%' + inner join jcl_org_sequence xl on zj.scheme_id=xl.scheme_id +where isnull(zd.forbidden_tag,0)<>1 and isnull(zd.delete_type,0)<>1; + +create view v_jcl_post as +select a.id*-1 fid,a.post_name fname,0 fparentid from JCL_ORG_POST a + inner join JCL_ORG_POST_INFO b on a.id =b.post_id and isnull(b.forbidden_tag,0)<>1 and isnull(b.delete_type,0)<>1 +where isnull(a.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; + +-- SqlServer +-- 更新分部ec_company +update jcl_org_comp set ec_company = ( select eccompany from ( select DISTINCT b.id as parent_company, c.id as eccompany from jcl_org_comp a inner join jcl_org_comp b on a.parent_company = b.id inner join hrmsubcompany c on b.uuid = c.uuid ) e where jcl_org_comp.parent_company = e.parent_company ); +-- 更新部门ec_department、ec_company +update JCL_ORG_DEPT set ec_department = ( select ecdepartment from ( select DISTINCT b.id as parent_dept, c.id as ecdepartment from JCL_ORG_DEPT a inner join JCL_ORG_DEPT b on a.parent_dept = b.id inner join hrmdepartment c on b.uuid = c.uuid ) e where JCL_ORG_DEPT.parent_dept = e.parent_dept ); +update JCL_ORG_DEPT set ec_company = ( select eccompany from ( select a.id as id, c.id as eccompany from jcl_org_comp a inner join hrmsubcompany c on a.uuid = c.uuid) e where JCL_ORG_DEPT.parent_comp = e.id ); +-- 更新人员jobtitle +update hrmresource set jobtitle = ( select top 1 id from HRMJOBTITLES where JOBTITLENAME = ( select JOB_NAME from jcl_org_job where id = ( select FIELD100002 from CUS_FIELDDATA where scope = 'HrmCustomFieldByInfoType' and SCOPEID = '-1' and CUS_FIELDDATA.ID = hrmresource.ID))); +-- 更新岗位ec_company、ec_department +update jcl_org_job set ec_company = (select eccompany from ( select a.id as id, c.id as eccompany from jcl_org_comp a inner join hrmsubcompany c on a.uuid = c.uuid) e where jcl_org_job.parent_comp = e.id ); +update jcl_org_job set ec_department = ( select ec_department from ( select a.id as id, c.id as ec_department from jcl_org_dept a inner join hrmdepartment c on a.uuid = c.uuid) e where jcl_org_job.parent_dept = e.id ); diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index 85776d49..c192a099 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -9,20 +9,22 @@ import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.browser.bo.CusBowserTreeBO; import com.engine.organization.entity.browser.enums.TreeNodeTypeEnum; import com.engine.organization.entity.browser.po.CusBrowserTree; +import com.engine.organization.entity.company.po.CompPO; +import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.job.vo.JobBrowserVO; import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; -import com.engine.organization.service.impl.JobServiceImpl; +import com.engine.organization.mapper.comp.CompMapper; +import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.DBType; +import com.engine.organization.util.db.MapperProxyFactory; +import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; import weaver.general.Util; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author:dxfeng @@ -38,34 +40,19 @@ public class JobBrowserService extends BrowserService { Map resultMap = new HashMap<>(); String datatype = Util.null2String(params.get("datatype")); if ("tree".equals(datatype)) { - List nodeData = new ArrayList<>(); String id = Util.null2String(params.get("id")); SearchTreeParams searchTreeParams = new SearchTreeParams(); - if (StringUtils.isBlank(id)) { - Map searchTree = new JobServiceImpl().getSearchTree(searchTreeParams); - Map datas = (Map) searchTree.get("datas"); - // 集团 - SearchTree rootCompany = (SearchTree) datas.get("rootCompany"); - nodeData.add(rootCompany); - } else if ("0".equals(id)) { - Map searchTree = new JobServiceImpl().getSearchTree(searchTreeParams); - Map datas = (Map) searchTree.get("datas"); - SearchTree rootCompany = (SearchTree) datas.get("rootCompany"); - nodeData.addAll(rootCompany.getSubs()); - } else { - String[] idArray = id.split("_"); - if (idArray.length == 2) { - if (TreeNodeTypeEnum.TYPE_COMP.getName().equals(idArray[0])) { - searchTreeParams.setType(TreeNodeTypeEnum.TYPE_COMP.getValue()); - } else if (TreeNodeTypeEnum.TYPE_DEPT.getName().equals(idArray[0])) { - searchTreeParams.setType(TreeNodeTypeEnum.TYPE_DEPT.getValue()); - } - searchTreeParams.setId(idArray[1]); - Map searchTree = new JobServiceImpl().getSearchTree(searchTreeParams); - List datas = (List) searchTree.get("datas"); - nodeData.addAll(datas.get(0).getSubs()); + searchTreeParams.setId(id); + String[] idArray = id.split("_"); + if (idArray.length == 2) { + if (TreeNodeTypeEnum.TYPE_COMP.getName().equals(idArray[0])) { + searchTreeParams.setType(TreeNodeTypeEnum.TYPE_COMP.getValue()); + } else if (TreeNodeTypeEnum.TYPE_DEPT.getName().equals(idArray[0])) { + searchTreeParams.setType(TreeNodeTypeEnum.TYPE_DEPT.getValue()); } + searchTreeParams.setId(idArray[1]); } + List nodeData = getCurrentTreeNode(searchTreeParams); List cusBrowserTrees = CusBowserTreeBO.convertSearchTreeToBorwserTree(nodeData); resultMap.put("datas", cusBrowserTrees); } else { @@ -109,7 +96,7 @@ public class JobBrowserService extends BrowserService { */ private String buildSqlWhere(Map params) { DBType dbType = DBType.get(new RecordSet().getDBType()); - String sqlWhere = " where t.delete_type ='0' "; + String sqlWhere = " where t.delete_type ='0' and forbidden_tag ='0' "; String jobNo = Util.null2String(params.get("jobNo")); if (StringUtils.isNotBlank(jobNo)) { sqlWhere += " AND t.job_no " + dbType.like(jobNo); @@ -139,4 +126,79 @@ public class JobBrowserService extends BrowserService { } return sqlWhere; } + + /** + * 获取当前点击节点下的层级数据 + * + * @param params + * @return + */ + private List getCurrentTreeNode(SearchTreeParams params) { + List treeNodes = new ArrayList<>(); + if (StringUtils.isBlank(params.getId())) { + // 集团总部 + SearchTree topGroup = SearchTreeUtil.getTopGroup(); + topGroup.setIsParent(true); + treeNodes.add(topGroup); + } else { + // 分部存在下级的ID + List compHasSubs = MapperProxyFactory.getProxy(CompMapper.class).hasSubs(); + // 部门存在下级的ID + List hasSubDepartment = MapperProxyFactory.getProxy(DepartmentMapper.class).hasSubs(); + + if ("0".equals(params.getId())) { + List compList = MapperProxyFactory.getProxy(CompMapper.class).listParent(); + // 获取顶层分部 + compList.stream().sorted(Comparator.comparing(CompPO::getShowOrder)).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item)); + } else if ("1".equals(params.getType())) { + // 当前节点下的元素 + CompPO compBuild = CompPO.builder().parentCompany(Long.parseLong(params.getId())).forbiddenTag(0).deleteType(0).build(); + List compList = MapperProxyFactory.getProxy(CompMapper.class).listByFilter(compBuild, "show_order"); + DepartmentPO departmentBuild = DepartmentPO.builder().parentComp(Long.parseLong(params.getId())).forbiddenTag(0).deleteType(0).build(); + List departmentList = MapperProxyFactory.getProxy(DepartmentMapper.class).listByFilter(departmentBuild, "show_order"); + compList.forEach(item -> buildCompNodes(treeNodes, compHasSubs, item)); + + departmentList.stream().filter(item -> null == item.getParentDept() || 0 == item.getParentDept()).forEach(item -> buildDeptNodes(treeNodes, hasSubDepartment, item)); + } else if ("2".equals(params.getType())) { + DepartmentPO departmentBuild = DepartmentPO.builder().parentDept(Long.parseLong(params.getId())).forbiddenTag(0).deleteType(0).build(); + List departmentList = MapperProxyFactory.getProxy(DepartmentMapper.class).listByFilter(departmentBuild, "show_order"); + departmentList.forEach(item -> buildDeptNodes(treeNodes, hasSubDepartment, item)); + } + + } + return treeNodes; + } + + + /** + * 构建分部节点 + * + * @param treeNodes + * @param compHasSubs + * @param company + */ + private void buildCompNodes(List treeNodes, List compHasSubs, CompPO company) { + SearchTree searchTree = new SearchTree(); + searchTree.setId(company.getId().toString()); + searchTree.setType(TreeNodeTypeEnum.TYPE_COMP.getValue()); + searchTree.setName(company.getCompName()); + searchTree.setIsParent(compHasSubs.contains(company.getId().toString())); + treeNodes.add(searchTree); + } + + /** + * 构建部门节点 + * + * @param treeNodes + * @param hasSubDepartment + * @param department + */ + private void buildDeptNodes(List treeNodes, List hasSubDepartment, DepartmentPO department) { + SearchTree searchTree = new SearchTree(); + searchTree.setId(department.getId().toString()); + searchTree.setName(department.getDeptName()); + searchTree.setType(TreeNodeTypeEnum.TYPE_DEPT.getValue()); + searchTree.setIsParent(hasSubDepartment.contains(department.getId().toString())); + treeNodes.add(searchTree); + } } diff --git a/src/com/api/organization/web/PersonnelCardController.java b/src/com/api/organization/web/PersonnelCardController.java new file mode 100644 index 00000000..cde89535 --- /dev/null +++ b/src/com/api/organization/web/PersonnelCardController.java @@ -0,0 +1,12 @@ +package com.api.organization.web; + +import javax.ws.rs.Path; + +/** + * @author:dxfeng + * @createTime: 2022/10/09 + * @version: 1.0 + */ +@Path("/bs/hrmorganization/personnelcard") +public class PersonnelCardController extends com.engine.organization.web.PersonnelCardController { +} diff --git a/src/com/engine/organization/entity/SelectOptionParam.java b/src/com/engine/organization/entity/SelectOptionParam.java index 94f75911..c89470c0 100644 --- a/src/com/engine/organization/entity/SelectOptionParam.java +++ b/src/com/engine/organization/entity/SelectOptionParam.java @@ -112,5 +112,28 @@ public class SelectOptionParam { return selectFields; } + /** + * 根据ID获取下拉框的展示文本 + * @param customValue + * @param id + * @return + */ + public static String getSelectOption(String customValue,String id) { + JSONArray objects = JSONObject.parseArray(customValue); + JSONObject o = (JSONObject) objects.get(2); + JSONArray datas = o.getJSONArray("datas"); + List selectFields = new ArrayList<>(); + if (!datas.isEmpty()) { + for (int i = 0; i < datas.size(); i++) { + selectFields.add((JSONObject) datas.get(i)); + } + } + JSONObject filter = selectFields.stream().filter(item -> id.equals(item.getString("id"))).findFirst().orElse(null); + if (null == filter) { + return ""; + } + return filter.getString("option"); + } + } diff --git a/src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java b/src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java index f641a4be..3dfa427b 100644 --- a/src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java +++ b/src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java @@ -3,7 +3,6 @@ package com.engine.organization.entity.browser.bo; import com.api.hrm.bean.TreeNode; import com.engine.organization.entity.browser.enums.TreeNodeTypeEnum; import com.engine.organization.entity.browser.po.CusBrowserTree; -import org.apache.commons.collections.CollectionUtils; import java.util.List; import java.util.stream.Collectors; @@ -25,8 +24,8 @@ public class CusBowserTreeBO { List collect = searchTree.stream().map(item -> CusBrowserTree.builder() .domid("sel_" + item.getId()) - .hasChild(CollectionUtils.isNotEmpty(item.getSubs())) - .isLeaf(CollectionUtils.isEmpty(item.getSubs())) + .hasChild(item.getIsParent()) + .isLeaf(!item.getIsParent()) .isopen(false) .key(getKey(item)) .name(item.getName()) diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index f0c62966..53ad65c1 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -9,6 +9,7 @@ import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; import weaver.crm.Maint.SectorInfoComInfo; import weaver.general.StringUtil; +import weaver.general.Util; import weaver.hrm.resource.ResourceComInfo; import java.util.*; @@ -36,8 +37,8 @@ public class CompBO { .parentCompany(e.getParentCompany()) .parentCompName(null == poMaps.get(e.getParentCompany()) ? "" : poMaps.get(e.getParentCompany()).getCompName()) .orgCode(e.getOrgCode()) - .industry(new SectorInfoComInfo().getSectorInfoname(e.getIndustry() + "")) - .compPrincipal(getUserNameById(e.getCompPrincipal() + "")) + .industry(new SectorInfoComInfo().getSectorInfoname(Util.null2String(e.getIndustry()))) + .compPrincipal(getUserNameById( Util.null2String(e.getCompPrincipal()))) .showOrder(e.getShowOrder()) .forbiddenTag(e.getForbiddenTag()) .build()).collect(Collectors.toList()); @@ -53,7 +54,7 @@ public class CompBO { e.setChildren(childList); e.setIsUsed(1); } else { - if (collect.contains(e.getId() + "")) { + if (collect.contains(Util.null2String(e.getId()))) { e.setIsUsed(1); } else { e.setIsUsed(0); @@ -88,6 +89,7 @@ public class CompBO { .compName(param.getCompName()) .compNameShort(param.getCompNameShort()) .parentCompany(param.getParentCompany()) + .ecCompany(param.getEcCompany()) .orgCode(param.getOrgCode()) .industry(param.getIndustry()) .compPrincipal(param.getCompPrincipal()) @@ -102,7 +104,7 @@ public class CompBO { } public static List buildSetToSearchTree(Set comps) { - return comps.stream().map(item -> { + return comps.stream().sorted(Comparator.comparing(CompPO::getShowOrder)).map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); tree.setCanceled(item.getForbiddenTag() != 0); @@ -114,6 +116,7 @@ public class CompBO { tree.setPid(null == item.getParentCompany() ? "0" : item.getParentCompany().toString()); tree.setSelected(false); tree.setType("1"); + tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder()); return tree; }).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/entity/company/param/CompSearchParam.java b/src/com/engine/organization/entity/company/param/CompSearchParam.java index 1134b99c..425bb5a5 100644 --- a/src/com/engine/organization/entity/company/param/CompSearchParam.java +++ b/src/com/engine/organization/entity/company/param/CompSearchParam.java @@ -42,6 +42,7 @@ public class CompSearchParam extends BaseQueryParam { * 上级公司 */ private Long parentCompany; + private Long ecCompany; /** * 组织机构代码 diff --git a/src/com/engine/organization/entity/company/po/CompPO.java b/src/com/engine/organization/entity/company/po/CompPO.java index 1ab9fd96..98bfc5c5 100644 --- a/src/com/engine/organization/entity/company/po/CompPO.java +++ b/src/com/engine/organization/entity/company/po/CompPO.java @@ -44,6 +44,8 @@ public class CompPO { */ private Long parentCompany; + private Long ecCompany; + /** * 组织机构代码 */ diff --git a/src/com/engine/organization/entity/cusfielddata/po/CusFieldData.java b/src/com/engine/organization/entity/cusfielddata/po/CusFieldData.java deleted file mode 100644 index 617f349b..00000000 --- a/src/com/engine/organization/entity/cusfielddata/po/CusFieldData.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.engine.organization.entity.cusfielddata.po; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author:dxfeng - * @createTime: 2022/08/01 - * @version: 1.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CusFieldData { - private Integer seqOrder; - private String scope; - private Long scopeId; - private Long id; - /** - * 职等职级字段，内容其实是职等树 - */ - private String field100001; - /** - * 担任岗位，内容其实是树id - */ - private String field100002; - /** - * 职务，内容是树id - */ - private String field100003; - /** - * 虚线上级 - */ - private String field100004; - /** - * 岗位序列 - */ - private String field100005; - /** - * 职等职级方案 - */ - private String field100006; - /** - * 职级 - */ - private String field100007; - /** - * 职等 - */ - private String field100008; - /** - * 职务类型 - */ - private String field100009; - /** - * 职务信息 - */ - private String field100010; - private String field100011; - private String field100012; - private String field100013; - private String field100014; -} diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 8c12d663..40024d09 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -10,6 +10,7 @@ import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.employee.EmployeeMapper; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; +import weaver.general.Util; import java.util.*; import java.util.stream.Collectors; @@ -50,7 +51,7 @@ public class DepartmentBO { e.setChildren(childList); e.setIsUsed(1); } else { - if (collect.contains(e.getId() + "")) { + if (collect.contains(Util.null2String(e.getId()))) { e.setIsUsed(1); } else { e.setIsUsed(0); @@ -84,7 +85,9 @@ public class DepartmentBO { .deptName(param.getDepartmentName()) .deptNameShort(param.getDeptNameShort()) .parentComp(null == param.getParentComp() ? param.getSubcompanyid1() : param.getParentComp()) + .ecCompany(param.getEcCompany()) .parentDept(null == param.getParentDept() ? param.getDepartmentid() : param.getParentDept()) + .ecDepartment(param.getEcDepartment()) .deptPrincipal(param.getDeptPrincipal()) .showOrder(param.getShowOrder()) .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1) @@ -138,6 +141,7 @@ public class DepartmentBO { tree.setSelected(false); tree.setType("2"); tree.setParentComp(null == item.getParentComp() ? "0" : item.getParentComp().toString()); + tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder()); return tree; }).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index 94e401ba..4da3d4ea 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -33,7 +33,7 @@ public class DepartmentListDTO { /** * 名称 */ - @TableTitle(title = "名称", dataIndex = "deptName", key = "deptName") + @TableTitle(title = "名称", dataIndex = "deptName", key = "deptName",width = "200") private String deptName; /** diff --git a/src/com/engine/organization/entity/department/param/DeptCopyParam.java b/src/com/engine/organization/entity/department/param/DeptCopyParam.java index 057cf0fb..eb4bfd86 100644 --- a/src/com/engine/organization/entity/department/param/DeptCopyParam.java +++ b/src/com/engine/organization/entity/department/param/DeptCopyParam.java @@ -23,4 +23,13 @@ public class DeptCopyParam { * 是否复制岗位 */ private String copyJob; + /** + * 是否复制子部门信息 + */ + private String copySubDept; + /** + * 是否复制子部门岗位信息 + */ + private String copySubJob; + } diff --git a/src/com/engine/organization/entity/department/param/DeptSearchParam.java b/src/com/engine/organization/entity/department/param/DeptSearchParam.java index 1eaff53c..ed70fcfe 100644 --- a/src/com/engine/organization/entity/department/param/DeptSearchParam.java +++ b/src/com/engine/organization/entity/department/param/DeptSearchParam.java @@ -26,8 +26,10 @@ public class DeptSearchParam extends BaseQueryParam { private String deptNameShort; private Long parentComp; + private Long ecCompany; private Long parentDept; + private Long ecDepartment; private Long deptPrincipal; diff --git a/src/com/engine/organization/entity/department/po/DepartmentPO.java b/src/com/engine/organization/entity/department/po/DepartmentPO.java index d4f5528f..ab4fcbf2 100644 --- a/src/com/engine/organization/entity/department/po/DepartmentPO.java +++ b/src/com/engine/organization/entity/department/po/DepartmentPO.java @@ -28,8 +28,10 @@ public class DepartmentPO { private String deptNameShort; private Long parentComp; + private Long ecCompany; private Long parentDept; + private Long ecDepartment; private Long deptPrincipal; //部门负责人 diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java index 7e3c7e6c..dbe1d060 100644 --- a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java +++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java @@ -21,12 +21,12 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @OrganizationTable(pageId = "80e7830c-18e8-4e14-8241-18821195ef31", fields = "t.id," + - "t.lastname," + + "t.last_name," + "t.mobile," + - "t.," + + "t.company_start_date," + "t.sex", - fromSql = "FROM HrmResource t ", - orderby = "id desc", + fromSql = "FROM jcl_org_hrmresource t ", + orderby = "id", primarykey = "id", tableType = WeaTableType.NONE ) @@ -35,7 +35,7 @@ public class EmployeeTableVO { @OrganizationTableColumn(column = "id", display = false) private Long id; - @OrganizationTableColumn(text = "姓名", width = "25%", column = "lastname") + @OrganizationTableColumn(text = "姓名", width = "25%", column = "last_name") private String lastname; @OrganizationTableColumn(text = "性别", width = "25%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName") @@ -44,7 +44,7 @@ public class EmployeeTableVO { @OrganizationTableColumn(text = "手机", width = "25%", column = "mobile") private String mobile; - @OrganizationTableColumn(text = "入职日期", width = "25%", column = "companystartdate") + @OrganizationTableColumn(text = "入职日期", width = "25%", column = "company_start_date") private String companystartdate; diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index a1e7073f..20baf30a 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -188,7 +188,7 @@ public class ExtendInfoBO { fieldItem.setLabel(""); } - fieldItem.setType(getFieldHtmlType(extendInfoPO.getControlType() + "")); + fieldItem.setType(getFieldHtmlType(Util.null2String(extendInfoPO.getControlType()))); fieldItem.setKey(extendInfoPO.getFieldName()); // 查看操作 全部设置为只读 if (1 == viewAttr) { @@ -320,7 +320,7 @@ public class ExtendInfoBO { } default: if (detailtype.equals("161") || detailtype.equals("162") || detailtype.equals("256") || detailtype.equals("257")) { - BrowserBean browserbean = new BrowserBean(detailtype + ""); + BrowserBean browserbean = new BrowserBean( Util.null2String(detailtype)); BrowserInitUtil browserInitUtil = new BrowserInitUtil(); String fielddbtype = customValue; if (!customValue.startsWith("browser.")) { @@ -435,7 +435,7 @@ public class ExtendInfoBO { detailtype = "1"; } searchConditionItem.setKey(Util.null2String(fieldvalue)); - searchConditionItem.setValue(fieldvalue + ""); + searchConditionItem.setValue(Util.null2String(fieldvalue)); searchConditionItem.setDetailtype(Util.getIntValue(detailtype, 3)); break; case "6": //附件 diff --git a/src/com/engine/organization/entity/fieldset/param/FieldTransferParam.java b/src/com/engine/organization/entity/fieldset/param/FieldTransferParam.java new file mode 100644 index 00000000..f6419cfc --- /dev/null +++ b/src/com/engine/organization/entity/fieldset/param/FieldTransferParam.java @@ -0,0 +1,20 @@ +package com.engine.organization.entity.fieldset.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/09/08 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class FieldTransferParam { + private String id; + private String name; +} diff --git a/src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java b/src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java index ecb2bc75..b3cb3006 100644 --- a/src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java +++ b/src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java @@ -35,6 +35,15 @@ public class HrmResourceSearchParam extends BaseQueryParam { * 部门 */ private Long departmentId; + /** + * 分部 + */ + private Long ecCompany; + + /** + * 部门 + */ + private Long ecDepartment; /** * 移动电话 diff --git a/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java b/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java index f67244fe..fb468ffe 100644 --- a/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java +++ b/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java @@ -27,11 +27,6 @@ public class HrmResourcePO { */ private String workCode; - /** - * 登录名 - */ - private String loginId; - /** * 姓名 */ @@ -73,14 +68,9 @@ public class HrmResourcePO { private Long jobTitle; /** - * 职称 - */ - private Integer jobCall; - - /** - * 职级 + * 职等 */ - private Long jobLevel; + private String jobLevel; /** * 职务类别 @@ -97,36 +87,16 @@ public class HrmResourcePO { */ private Integer status; - /** - * 系统语言 - */ - private Integer systemLanguage; - /** * 照片 */ private String resourceImageId; - /** - * 头像 - */ - private String messagerUrl; - /** * 办公地点 */ private Integer locationId; - /** - * 直接上级 - */ - private Integer managerId; - - /** - * 助理 - */ - private Integer assistantId; - /** * 移动电话 */ @@ -137,151 +107,16 @@ public class HrmResourcePO { */ private String telephone; - /** - * 其他电话 - */ - private String mobileCall; - - /** - * 传真 - */ - private String fax; - /** * 电子邮件 */ private String email; - /** - * 办公室 - */ - private String workroom; - private Long creator; private int deleteType; private Date createTime; private Date updateTime; - /** - * 密码 - */ - private String passWord; - - /** - * 安全级别 - */ - private Integer secLevel; - - /** - * 出生日期 - */ - private String birthday; - - /** - * 民族 - */ - private String folk; - - /** - * 籍贯 - */ - private String nativePlace; - - /** - * 户口 - */ - private String regResidentPlace; - - /** - * 身份证号码 - */ - private String certificateNum; - - /** - * 婚姻状况 - */ - private String maritalStatus; - - /** - * 政治面貌 - */ - private String policy; - - /** - * 入团日期 - */ - private String beMemberDate; - - /** - * 入党日期 - */ - private String bePartyDate; - - /** - * 工会会员 - */ - private String islabouunion; - - /** - * 学位 - */ - private String degree; - - /** - * 健康状况 - */ - private String healthInfo; - - /** - * 学历 - */ - private Integer educationLevel; - - /** - * 身高 - */ - private String height; - - /** - * 体重 - */ - private Integer weight; - - /** - * 用工性质 - */ - private Integer useKind; - - /** - * 合同开始日期 - */ - private String startDate; - - /** - * 合同结束日期 - */ - private String endDate; - - /** - * 试用期结束日期 - */ - private String probationEndDate; - - /** - * 现居住地 - */ - private String residentPlace; - - /** - * 家庭联系方式 - */ - private String homeAddress; - - /** - * 暂住证号码 - */ - private String tempResidentNumber; - /** * 入职日期 */ @@ -292,41 +127,22 @@ public class HrmResourcePO { */ private String workStartDate; - /** - * 公积金帐户 - */ - private String accumFundAccount; - - /** - * 工资账号户名 - */ - private String accountName; - - /** - * 工资银行 - */ - private Integer bankId; - - /** - * 工资账号 - */ - private String accountId; - /** * 显示顺序 */ private Integer showOrder; - /** - * 人员密级 - */ - private Integer classification; + private Long ecDepartment; + + private Long ecCompany; + private String uuid; - private String workYear; + private String jobGrade; + private Integer schemeId; - private String companyWorkYear; + private Integer sequenceId; private String baseFieldsValue; diff --git a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java index 40bbce2a..77f70c1e 100644 --- a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java +++ b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java @@ -30,11 +30,7 @@ import lombok.NoArgsConstructor; sortway = " asc", primarykey = "id", operates = { - @OrganizationTableOperate(index = "0", text = "发消息"), - @OrganizationTableOperate(index = "1", text = "发送邮件"), - @OrganizationTableOperate(index = "1", text = "发送短信"), - @OrganizationTableOperate(index = "1", text = "新建日程"), - @OrganizationTableOperate(index = "1", text = "系统信息"), + @OrganizationTableOperate(text = "查看") }, tableType = WeaTableType.CHECKBOX ) diff --git a/src/com/engine/organization/entity/jclimport/po/CusFormFieldPO.java b/src/com/engine/organization/entity/jclimport/po/CusFormFieldPO.java index 691c02d0..5f7dd40a 100644 --- a/src/com/engine/organization/entity/jclimport/po/CusFormFieldPO.java +++ b/src/com/engine/organization/entity/jclimport/po/CusFormFieldPO.java @@ -32,4 +32,5 @@ public class CusFormFieldPO { */ private String dmlUrl; private String tableName; + private String scopeId; } diff --git a/src/com/engine/organization/entity/job/bo/JobBO.java b/src/com/engine/organization/entity/job/bo/JobBO.java index 7e85404f..907a348a 100644 --- a/src/com/engine/organization/entity/job/bo/JobBO.java +++ b/src/com/engine/organization/entity/job/bo/JobBO.java @@ -1,7 +1,5 @@ package com.engine.organization.entity.job.bo; -import com.engine.organization.entity.company.po.CompPO; -import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.job.dto.JobListDTO; import com.engine.organization.entity.job.param.JobSearchParam; import com.engine.organization.entity.job.po.JobPO; @@ -10,7 +8,6 @@ import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.transmethod.JobTransMethod; import com.engine.organization.util.db.MapperProxyFactory; -import com.engine.organization.util.relation.EcHrmRelationUtil; import org.apache.commons.collections.CollectionUtils; import weaver.general.Util; @@ -29,8 +26,6 @@ public class JobBO { if (null == param) { return null; } - CompPO jclCompany = EcHrmRelationUtil.getJclCompanyId(null == param.getEcCompany() ? Util.null2String(param.getSubcompanyid1()) : param.getEcCompany().toString()); - DepartmentPO jclDepartment = EcHrmRelationUtil.getJclDepartmentId(null == param.getEcDepartment() ? Util.null2String(param.getDepartmentid()) : param.getEcDepartment().toString()); return JobPO .builder() .id(param.getId() == null ? 0 : param.getId()) @@ -38,8 +33,8 @@ public class JobBO { .jobName(param.getJobName()) .ecCompany(param.getEcCompany()) .ecDepartment(param.getEcDepartment()) - .parentComp(null == jclCompany ? param.getSubcompanyid1() : jclCompany.getId()) - .parentDept(null == jclDepartment ? param.getDepartmentid() : jclDepartment.getId()) + .parentComp(param.getSubcompanyid1()) + .parentDept( param.getDepartmentid()) .sequenceId(param.getSequenceId()) .schemeId(param.getSchemeId()) .parentJob(param.getParentJob()) @@ -103,14 +98,13 @@ public class JobBO { Map> collects = dtoList.stream().filter(item -> null != item.getParentJob() && 0 != item.getParentJob()).collect(Collectors.groupingBy(JobListDTO::getParentJob)); // 处理被引用数据 List usedIds = MapperProxyFactory.getProxy(JobMapper.class).listUsedId(); - List collect = Arrays.stream(String.join(",", usedIds).split(",")).collect(Collectors.toList()); return dtoList.stream().peek(e -> { List childList = collects.get(e.getId()); if (CollectionUtils.isNotEmpty(childList)) { e.setChildren(childList); e.setIsUsed(1); } else { - if (collect.contains(e.getId() + "")) { + if (usedIds.contains(Util.null2String(e.getId()))) { e.setIsUsed(1); } else { e.setIsUsed(0); @@ -167,6 +161,7 @@ public class JobBO { tree.setSelected(false); tree.setType("3"); tree.setParentComp(null == item.getParentDept() ? "0" : item.getParentDept().toString()); + tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder()); return tree; }).collect(Collectors.toList()); diff --git a/src/com/engine/organization/entity/job/param/JobMergeParam.java b/src/com/engine/organization/entity/job/param/JobMergeParam.java index b5629f38..09d29251 100644 --- a/src/com/engine/organization/entity/job/param/JobMergeParam.java +++ b/src/com/engine/organization/entity/job/param/JobMergeParam.java @@ -17,11 +17,11 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class JobMergeParam { /** - * 所选分部 + * 所选岗位 */ private Long id; /** - * 合并分部 + * 合并到的岗位 */ private Long targetJob; /** diff --git a/src/com/engine/organization/entity/map/JclOrgMap.java b/src/com/engine/organization/entity/map/JclOrgMap.java index e584c393..f8467bd6 100644 --- a/src/com/engine/organization/entity/map/JclOrgMap.java +++ b/src/com/engine/organization/entity/map/JclOrgMap.java @@ -34,4 +34,18 @@ public class JclOrgMap { Integer fIsVitual; Date fDateBegin; Date fDateEnd; + + public Integer getFPlan() { + if (null == fPlan) { + fPlan = 0; + } + return fPlan; + } + + public Integer getFOnJob() { + if (null == fOnJob) { + fOnJob = 0; + } + return fOnJob; + } } diff --git a/src/com/engine/organization/entity/personnelcard/Anchor.java b/src/com/engine/organization/entity/personnelcard/Anchor.java new file mode 100644 index 00000000..1b8f8145 --- /dev/null +++ b/src/com/engine/organization/entity/personnelcard/Anchor.java @@ -0,0 +1,22 @@ +package com.engine.organization.entity.personnelcard; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 锚点实体类 + * + * @author:dxfeng + * @createTime: 2022/10/08 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class Anchor { + private String id; + private String title; +} diff --git a/src/com/engine/organization/entity/personnelcard/FormItem.java b/src/com/engine/organization/entity/personnelcard/FormItem.java new file mode 100644 index 00000000..4d7e1867 --- /dev/null +++ b/src/com/engine/organization/entity/personnelcard/FormItem.java @@ -0,0 +1,23 @@ +package com.engine.organization.entity.personnelcard; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author:dxfeng + * @createTime: 2022/10/08 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class FormItem { + private String id; + private String title; + private List items; +} diff --git a/src/com/engine/organization/entity/personnelcard/Iframe.java b/src/com/engine/organization/entity/personnelcard/Iframe.java new file mode 100644 index 00000000..31c96e25 --- /dev/null +++ b/src/com/engine/organization/entity/personnelcard/Iframe.java @@ -0,0 +1,21 @@ +package com.engine.organization.entity.personnelcard; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/10/08 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class Iframe { + private String id; + private String title; + private String url; +} diff --git a/src/com/engine/organization/entity/personnelcard/Item.java b/src/com/engine/organization/entity/personnelcard/Item.java new file mode 100644 index 00000000..fad39bde --- /dev/null +++ b/src/com/engine/organization/entity/personnelcard/Item.java @@ -0,0 +1,20 @@ +package com.engine.organization.entity.personnelcard; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/10/08 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class Item { + private String fieldId; + private Object fieldValue; +} diff --git a/src/com/engine/organization/entity/personnelcard/ResourceBaseTab.java b/src/com/engine/organization/entity/personnelcard/ResourceBaseTab.java new file mode 100644 index 00000000..c2132001 --- /dev/null +++ b/src/com/engine/organization/entity/personnelcard/ResourceBaseTab.java @@ -0,0 +1,30 @@ +package com.engine.organization.entity.personnelcard; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 人员自定义显示栏目实体类 + * + * @author:dxfeng + * @createTime: 2022/10/09 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ResourceBaseTab { + private Integer id; + private String groupName; + private Integer groupLabel; + private Integer dspOrder; + private String isOpen; + private String isMand; + private String isUsed; + private String isSystem; + private String linkUrl; + private String tabNum; +} diff --git a/src/com/engine/organization/entity/personnelcard/ResourceStatusEnum.java b/src/com/engine/organization/entity/personnelcard/ResourceStatusEnum.java new file mode 100644 index 00000000..b8cf8875 --- /dev/null +++ b/src/com/engine/organization/entity/personnelcard/ResourceStatusEnum.java @@ -0,0 +1,53 @@ +package com.engine.organization.entity.personnelcard; + +import com.engine.organization.exception.OrganizationRunTimeException; + +/** + * @author:dxfeng + * @createTime: 2022/10/14 + * @version: 1.0 + */ +public enum ResourceStatusEnum { + TRY_OUT("0", "试用"), + OFFICIAL("1", "正式"), + TEMPORARILY("2", "临时"), + TRIAL_EXTENSION("3", "试用延期"), + DISMISSAL("4", "解聘"), + RESIGN("5", "离职"), + RETIRE("6", "退休"), + INVALID("7", "无效"), + WORK("8", "在职"); + + private String value; + private String name; + + ResourceStatusEnum(String value, String name) { + this.value = value; + this.name = name; + } + + public static ResourceStatusEnum getResourceStatus(String value) { + for (ResourceStatusEnum item : ResourceStatusEnum.values()) { + if (item.value.equalsIgnoreCase(value)) { + return item; + } + } + throw new OrganizationRunTimeException("未找到对应状态"); + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/com/engine/organization/entity/personnelcard/Statistical.java b/src/com/engine/organization/entity/personnelcard/Statistical.java new file mode 100644 index 00000000..4c50d1fd --- /dev/null +++ b/src/com/engine/organization/entity/personnelcard/Statistical.java @@ -0,0 +1,23 @@ +package com.engine.organization.entity.personnelcard; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/10/08 + * @version: 1.0 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class Statistical { + private Integer workflowCount; + private Integer docCount; + private Integer cusCount; + private Integer collaborationCount; + private Integer weiboCount; +} diff --git a/src/com/engine/organization/entity/personnelcard/User.java b/src/com/engine/organization/entity/personnelcard/User.java new file mode 100644 index 00000000..78afd4c9 --- /dev/null +++ b/src/com/engine/organization/entity/personnelcard/User.java @@ -0,0 +1,50 @@ +package com.engine.organization.entity.personnelcard; + +import com.api.system.language.service.LanguageService; +import com.engine.organization.entity.extend.po.ExtendInfoPO; +import com.engine.organization.util.field.FieldDefinedValueUtil; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; + +/** + * @author:dxfeng + * @createTime: 2022/10/08 + * @version: 1.0 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class User { + private Integer id; + private String image; + private String name; + private String sex; + private String email; + private String phone; + private String belongTo; + private String status; + + public String getBelongTo() { + return StringUtils.isBlank(belongTo) ? "主账号" : "次账号"; + } + + public String getStatus() { + if (StringUtils.isNotBlank(status)) { + return ResourceStatusEnum.getResourceStatus(status).getName(); + } + return status; + } + + public String getImage() { + weaver.hrm.User user = new weaver.hrm.User(); + user.setLanguage(LanguageService.getDefaultLang()); + if(StringUtils.isNotBlank(image)&& image.contains("/")){ + return image; + } + return FieldDefinedValueUtil.getFieldValue(user, ExtendInfoPO.builder().controlType(6).browserType("1").build(), image); + } +} diff --git a/src/com/engine/organization/entity/searchtree/SearchTree.java b/src/com/engine/organization/entity/searchtree/SearchTree.java index 14c98631..b279b3e2 100644 --- a/src/com/engine/organization/entity/searchtree/SearchTree.java +++ b/src/com/engine/organization/entity/searchtree/SearchTree.java @@ -18,4 +18,5 @@ public class SearchTree extends TreeNode { private boolean isCanceled; private String requestParams; private String parentComp; + private Integer orderNum; } \ No newline at end of file diff --git a/src/com/engine/organization/entity/staff/bo/StaffBO.java b/src/com/engine/organization/entity/staff/bo/StaffBO.java index bd058175..5efced65 100644 --- a/src/com/engine/organization/entity/staff/bo/StaffBO.java +++ b/src/com/engine/organization/entity/staff/bo/StaffBO.java @@ -3,6 +3,7 @@ package com.engine.organization.entity.staff.bo; import com.engine.organization.entity.staff.param.StaffSearchParam; import com.engine.organization.entity.staff.po.StaffPO; import com.engine.organization.transmethod.StaffTransMethod; +import weaver.general.Util; import java.util.Date; @@ -20,7 +21,9 @@ public class StaffBO { .id(param.getId()) .planId(param.getPlanId()) .compId(param.getCompId()) + .ecCompany(param.getEcCompany()) .deptId(param.getDeptId()) + .ecDepartment(param.getEcDepartment()) .jobId(param.getJobId()) .staffNum(param.getStaffNum()) .controlPolicy(param.getControlPolicy()) @@ -43,7 +46,7 @@ public class StaffBO { String sb = "编制数：" + parseNull(staffPO.getStaffNum()) + ",在编数：" + parseNull(staffPO.getPermanentNum()) + ",冻结数：" + parseNull(staffPO.getFreezeNum()) + - ",缺编状态：" + StaffTransMethod.getLackSpan(staffPO.getLackStatus() + ""); + ",缺编状态：" + StaffTransMethod.getLackSpan(Util.null2String(staffPO.getLackStatus())); staffPO.setStaffDesc(sb); } diff --git a/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java b/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java index 3e1c46aa..6682fb6f 100644 --- a/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java +++ b/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java @@ -26,6 +26,7 @@ public class StaffPlanBO { .timeStart(StringUtil.isEmpty(param.getTimeStart()) ? null : DateUtil.parseToDateTime(param.getTimeStart())) .timeEnd(StringUtil.isEmpty(param.getTimeEnd()) ? null : DateUtil.parseToDateTime(param.getTimeEnd())) .companyId(param.getCompanyId()) + .ecCompany(param.getEcCompany()) .controlDimension(param.getControlDimension()) .description(param.getDescription()) .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1) diff --git a/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java b/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java index 6a68e479..2b646ce3 100644 --- a/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java +++ b/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java @@ -44,6 +44,7 @@ public class StaffPlanSearchParam { * 适用公司 */ private String companyId; + private String ecCompany; /** * 控制维度 */ diff --git a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java b/src/com/engine/organization/entity/staff/param/StaffSearchParam.java index 49fb0f68..29e944ae 100644 --- a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java +++ b/src/com/engine/organization/entity/staff/param/StaffSearchParam.java @@ -28,10 +28,12 @@ public class StaffSearchParam { * 分部 */ private Long compId; + private Long ecCompany; /** * 部门 */ private Long deptId; + private Long ecDepartment; /** * 岗位 */ diff --git a/src/com/engine/organization/entity/staff/po/StaffPO.java b/src/com/engine/organization/entity/staff/po/StaffPO.java index 992d5ee7..bedc2ea7 100644 --- a/src/com/engine/organization/entity/staff/po/StaffPO.java +++ b/src/com/engine/organization/entity/staff/po/StaffPO.java @@ -30,10 +30,12 @@ public class StaffPO { * 分部 */ private Long compId; + private Long ecCompany; /** * 部门 */ private Long deptId; + private Long ecDepartment; /** * 岗位 */ diff --git a/src/com/engine/organization/entity/staff/po/StaffPlanPO.java b/src/com/engine/organization/entity/staff/po/StaffPlanPO.java index a63b0e30..dc802d5f 100644 --- a/src/com/engine/organization/entity/staff/po/StaffPlanPO.java +++ b/src/com/engine/organization/entity/staff/po/StaffPlanPO.java @@ -46,8 +46,12 @@ public class StaffPlanPO { * 适用公司 */ private String companyId; + private String ecCompany; /** * 控制维度 + * 1:分部 + * 2：部门 + * 3：岗位 */ private String controlDimension; /** diff --git a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java index 165d3632..671422f8 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java @@ -26,9 +26,7 @@ import lombok.NoArgsConstructor; @OrganizationTableOperate(text = "编辑"), @OrganizationTableOperate(index = "1", text = "删除"), @OrganizationTableOperate(index = "2", text = "变更") - }, tableType = WeaTableType.CHECKBOX, - operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatStaffOperates", otherpara = "column:is_used"), - checkboxPopedom = @CheckboxPopedom(showmethod = "com.engine.organization.util.ConfigTrans.getCheckBoxPopedom", popedompara = "column:is_used") + }, tableType = WeaTableType.CHECKBOX ) public class StaffTableVO { diff --git a/src/com/engine/organization/enums/OrgImportAdapter.java b/src/com/engine/organization/enums/OrgImportAdapter.java new file mode 100644 index 00000000..99955cf6 --- /dev/null +++ b/src/com/engine/organization/enums/OrgImportAdapter.java @@ -0,0 +1,17 @@ +package com.engine.organization.enums; + +import weaver.hrm.User; + +import java.util.List; +import java.util.Map; + +/** + * @author:dxfeng + * @createTime: 2022/09/15 + * @version: 1.0 + */ +public interface OrgImportAdapter { + Map orgImport(Map params, User user); + + List> orgForm(User user); +} diff --git a/src/com/engine/organization/enums/OrgImportEnum.java b/src/com/engine/organization/enums/OrgImportEnum.java new file mode 100644 index 00000000..eea07e33 --- /dev/null +++ b/src/com/engine/organization/enums/OrgImportEnum.java @@ -0,0 +1,47 @@ +package com.engine.organization.enums; + +import com.engine.organization.exception.OrganizationRunTimeException; +import com.engine.organization.util.saveimport.StaffInfoImportUtil; +import weaver.hrm.User; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author:dxfeng + * @createTime: 2022/09/15 + * @version: 1.0 + */ +public enum OrgImportEnum implements OrgImportAdapter { + STAFF("staff") { + @Override + public Map orgImport(Map params, User user) { + Map resultMap = new HashMap<>(); + String excelFile = (String) params.get("excelfile"); + resultMap.put("pId", StaffInfoImportUtil.saveImport("add", excelFile, user)); + return resultMap; + } + + @Override + public List> orgForm(User user) { + return StaffInfoImportUtil.importForm(user); + } + }; + + + private String tableName; + + OrgImportEnum(String tableName) { + this.tableName = tableName; + } + + public static OrgImportEnum getOrgImportUtil(String tableName) { + for (OrgImportEnum item : OrgImportEnum.values()) { + if (item.tableName.equalsIgnoreCase(tableName)) { + return item; + } + } + throw new OrganizationRunTimeException("不支持的导入类型"); + } +} diff --git a/src/com/engine/organization/mapper/comp/CompMapper.java b/src/com/engine/organization/mapper/comp/CompMapper.java index 6bec7217..aad7c06f 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.java +++ b/src/com/engine/organization/mapper/comp/CompMapper.java @@ -30,6 +30,8 @@ public interface CompMapper { List listUsedIds(); + List hasSubs(); + /** * 根据搜索条件查询数据 * diff --git a/src/com/engine/organization/mapper/comp/CompMapper.xml b/src/com/engine/organization/mapper/comp/CompMapper.xml index 96ca0365..ac0acd15 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.xml +++ b/src/com/engine/organization/mapper/comp/CompMapper.xml @@ -7,6 +7,7 @@ + @@ -30,6 +31,7 @@ , t.comp_name , t.comp_name_short , t.parent_company + , t.ec_company , t.org_code , t.industry , t.comp_principal @@ -98,6 +100,9 @@ parent_company, + + ec_company, + org_code, @@ -140,6 +145,9 @@ #{parentCompany}, + + #{ecCompany}, + #{orgCode}, @@ -160,7 +168,7 @@ - + select JCL_ORG_COMP_ID.currval from dual INSERT INTO jcl_org_comp @@ -189,6 +197,9 @@ parent_company, + + ec_company, + org_code, @@ -231,6 +242,9 @@ #{parentCompany}, + + #{ecCompany}, + #{orgCode}, @@ -303,6 +317,9 @@ and t.parent_company = #{compPO.parentCompany} + + and t.ec_company = #{compPO.ecCompany} + and t.industry = #{compPO.industry} @@ -407,6 +424,17 @@ where t.delete_type = 0 AND comp_no = #{companyNo} + update jcl_org_comp @@ -434,6 +462,7 @@ comp_name=#{compName}, comp_name_short=#{compNameShort}, parent_company=#{parentCompany}, + ec_company=#{ecCompany}, org_code=#{orgCode}, industry=#{industry}, comp_principal=#{compPrincipal}, diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.java b/src/com/engine/organization/mapper/department/DepartmentMapper.java index 35c5c56d..4e205c53 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.java +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.java @@ -134,4 +134,8 @@ public interface DepartmentMapper { Long getIdByNameAndPid(@Param("departmentName") String departmentName, @Param("parentCompany") Long parentCompany, @Param("parentDepartment") Long parentDepartment); int checkRepeatNo(@Param("departmentNo") String departmentNo, @Param("id") Long id); + + List hasSubs(); + + int countUsedInJob(@Param("departmentId") Long departmentId); } diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index 4221b0fe..018fd1a2 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -7,7 +7,9 @@ + + @@ -30,7 +32,9 @@ t.dept_name, t.dept_name_short, t.parent_comp, + t.ec_company, t.parent_dept, + t.ec_department, t.dept_principal, t.show_order, t.description, @@ -39,17 +43,19 @@ + + and ifnull(parent_dept,0) = #{parentDepartment} @@ -211,9 +236,15 @@ parent_comp, + + ec_company, + parent_dept, + + ec_department, + dept_principal, @@ -253,9 +284,15 @@ #{parentComp}, + + #{ecCompany}, + #{parentDept}, + + #{ecDepartment}, + #{deptPrincipal}, @@ -303,9 +340,15 @@ parent_comp, + + ec_company, + parent_dept, + + ec_department, + dept_principal, @@ -345,9 +388,15 @@ #{parentComp}, + + #{ecCompany}, + #{parentDept}, + + #{ecDepartment}, + #{deptPrincipal}, @@ -372,7 +421,9 @@ dept_name=#{deptName}, dept_name_short=#{deptNameShort}, parent_comp=#{parentComp}, + ec_company=#{ecCompany}, parent_dept=#{parentDept}, + ec_department=#{ecDepartment}, dept_principal=#{deptPrincipal}, show_order=#{showOrder}, description=#{description}, diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index 1eee5d53..cbc8cd91 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -351,7 +351,6 @@ field_name_desc=#{fieldNameDesc}, isenable=#{isenable}, isrequired=#{isrequired}, - edit_show=#{editShow}, show_order=#{showOrder}, custom_value=#{customValue}, @@ -437,7 +436,7 @@ select from jcl_field_extendinfo t - where t.delete_type = 0 and t.isenable = 1 and t.extend_type = #{extendType} + where t.delete_type = 0 and list_show = 1 and t.isenable = 1 and t.extend_type = #{extendType} and t.field_name_desc = #{labelName} diff --git a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java index b2713f76..219439ec 100644 --- a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java +++ b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java @@ -17,6 +17,9 @@ public interface HrmResourceMapper { */ Long getMaxId(); + Long getMaxShowOrder(); + + /** * 根据ID查询姓名 * @@ -41,4 +44,8 @@ public interface HrmResourceMapper { // * @return // */ //List getKeyMapByKetField(@Param("keyField") String keyField); + + String getEcResourceId(@Param("jclResourceId") String jclResourceId); + + Long getJclResourceId(@Param("ecResourceId") String ecResourceId); } diff --git a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml index 45717e7c..c459937f 100644 --- a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml @@ -38,7 +38,23 @@ where delete_type = 0 and ${keyField} = #{keyFieldValue} - + + + + diff --git a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java index bcef9501..19365ba4 100644 --- a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java +++ b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java @@ -2,7 +2,6 @@ package com.engine.organization.mapper.hrmresource; import com.engine.organization.entity.commom.RecordInfo; -import com.engine.organization.entity.cusfielddata.po.CusFieldData; import com.engine.organization.entity.jclimport.po.CusFormFieldPO; import com.engine.organization.entity.jclimport.po.JclSelectItem; import org.apache.ibatis.annotations.Param; @@ -17,18 +16,6 @@ import java.util.List; */ public interface SystemDataMapper { - //JSONObject getSysLanguageByLicense(); - - //List getSysLanguageByActivable(); - - //List getHrmEducationLevelData(); - - //List getHrmJobCallData(); - - //List getHrmLocationsByCountryId(); - - //List getHrmUseKindData(); - String getScCompanyNameById(@Param("companyId") String companyId); String getScDepartmentNameById(@Param("departmentId") String departmentId); @@ -43,6 +30,8 @@ public interface SystemDataMapper { List getHrmResourceIds(@Param("departmentId") Long departmentId, @Param("jobTitle") String jobTitle); + List getHrmResourceIdsByDept(@Param("departmentId") String departmentId); + /** * 更新人员岗位 * @@ -65,13 +54,6 @@ public interface SystemDataMapper { List getSelectItems(@Param("tableName") String tableName, @Param("fieldId") Long fieldId); - - CusFieldData getHrmCusFieldDataByIdAndScopeId(@Param("id") Long id, @Param("scopeId") Long scopeId); - - int insertCusFieldData(CusFieldData cusFieldData); - - int updateCusFieldData(CusFieldData cusFieldData); - Long getHrmResourceMaxId(); } diff --git a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml index a93e0d34..6b98fdef 100644 --- a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml +++ b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml @@ -10,6 +10,7 @@ + @@ -25,10 +26,6 @@ - - insert into cus_fielddata(scope, scopeid, id) - values ('HrmCustomFieldByInfoType', #{scopeId}, #{id}) - update hrmresource set JOBTITLE = #{jobTitle} where id in @@ -36,55 +33,8 @@ #{id} - - update cus_fielddata - - field100001=#{field100001}, - field100002=#{field100002}, - field100003=#{field100003}, - field100008=#{field100008}, - field100006=#{field100006}, - field100007=#{field100007}, - field100005=#{field100005}, - field100010=#{field100010}, - field100009=#{field100009}, - - where scope = 'HrmCustomFieldByInfoType' - and id = #{id} - and scopeid = #{scopeId} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.java b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.java index 0ff44758..68faf43a 100644 --- a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.java +++ b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.java @@ -1,6 +1,9 @@ package com.engine.organization.mapper.jclorgmap; import com.engine.organization.entity.map.JclOrgMap; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author:dxfeng @@ -9,4 +12,18 @@ import com.engine.organization.entity.map.JclOrgMap; */ public interface JclOrgMapper { int insertMap(JclOrgMap jclOrgMap); + + JclOrgMap getJclOrgMapByObjID(@Param("currentDate") String currentDate, @Param("fType") String fType, @Param("objId") String objId); + + int deleteMap(@Param("ftype") String ftype, @Param("fobjid") String fobjid, @Param("currentDate") String currentDate); + + int updateMap(@Param("ftype") String ftype, @Param("fobjid") String fobjid, @Param("currentDate") String currentDate, @Param("yesterday") String yesterday); + + JclOrgMap getJclOrgMapByFParentId(@Param("currentDate") String currentDate, @Param("fparentid") String fparentid); + + JclOrgMap getJclOrgMapById(@Param("currentDate") String currentDate, @Param("id") String id); + + JclOrgMap getSumPlanAndJobByFParentId(@Param("currentDate") String currentDate, @Param("fparentid") String fparentid); + + int updateMapById(@Param("id") Integer id,@Param("fplan") Integer fplan,@Param("fonjob") Integer fonjob,@Param("currentDate") String currentDate); } diff --git a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml index df066023..e72f55a3 100644 --- a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml +++ b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml @@ -13,4 +13,57 @@ #{fObjParentId}, #{fPlan}, #{fOnJob}, #{fIsVitual}, #{fDateBegin}, #{fDateEnd}) + + update jcl_org_map + + fdateend=#{yesterday}, + + where ftype=#{ftype} and fobjid=#{fobjid} and fdateend > #{currentDate} + + + delete + from jcl_org_map + where ftype = #{ftype} + and fobjid = #{fobjid} + and fdatebegin = #{currentDate} + + + + + + + update jcl_org_map + + fplan=#{fplan}, + fonjob=#{fonjob}, + + where id=#{id} + AND FDATEBEGIN <= #{currentDate} + AND FDATEEND >= #{currentDate} + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index 50d8c9b0..9b6eab4f 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -88,6 +88,16 @@ public interface JobMapper { */ List listByNameExceptId(@Param("jobName") String jobName, @Param("id") Long id); + /** + * 统计同一层级下是否有重名岗位 + * @param jobName + * @param id + * @param parentJob + * @param ecDepartment + * @return + */ + Integer countRepeatNameByPid(@Param("jobName") String jobName, @Param("id") Long id, @Param("parentJob") Long parentJob, @Param("ecDepartment") Long ecDepartment); + /** * 根据所属部门查询数据 * @@ -136,6 +146,7 @@ public interface JobMapper { */ List listUsedId(); + /** * 获取最大排序 * @@ -154,6 +165,8 @@ public interface JobMapper { */ Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Long parentCompany, @Param("parentDepartment") Long parentDepartment, @Param("parentJob") Long parentJob); + Long getIdByNameAndEcId(@Param("jobName") String jobName, @Param("ecCompany") String ecCompany, @Param("ecDepartment") String ecDepartment); + int checkRepeatNo(@Param("jobNo") String jobNo, @Param("id") Long id); /** @@ -164,4 +177,6 @@ public interface JobMapper { * @return */ int updateJobCompany(@Param("ids") Collection ids, @Param("parentCompany") Long parentCompany, @Param("ecCompany") String ecCompany); + + int isHasResource(@Param("jobId") Long jobId); } diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 208ef6a6..12498ca0 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -317,6 +317,8 @@ job_name=#{jobName}, parent_comp=#{parentComp}, parent_dept=#{parentDept}, + ec_company=#{ecCompany}, + ec_department=#{ecDepartment}, sequence_id=#{sequenceId}, scheme_id=#{schemeId}, parent_job=#{parentJob}, @@ -387,6 +389,9 @@ and t.parent_dept = #{jobPO.parentDept} + + and t.parent_job = #{jobPO.parentJob} + and t.ec_company = #{jobPO.ecCompany} @@ -462,6 +467,10 @@ select job_id from JCL_ORG_STAFF where delete_type = 0 + union + select job_title + from jcl_org_hrmresource + where STATUS < 4 + + + and ifnull(parent_job,0) = diff --git a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.java b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.java new file mode 100644 index 00000000..8671c926 --- /dev/null +++ b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.java @@ -0,0 +1,28 @@ +package com.engine.organization.mapper.personnelcard; + +import com.engine.organization.entity.personnelcard.ResourceBaseTab; +import com.engine.organization.entity.personnelcard.User; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author:dxfeng + * @createTime: 2022/10/08 + * @version: 1.0 + */ +public interface PersonnelCardMapper { + /** + * 获取人员卡片User对象 + * + * @param id + * @return + */ + User getUserById(@Param("id") Long id); + + /** + * 获取自定义显示栏目 + * @return + */ + List getResourceBaseTabList(); +} diff --git a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml new file mode 100644 index 00000000..535c9bd6 --- /dev/null +++ b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/resource/ResourceMapper.java b/src/com/engine/organization/mapper/resource/ResourceMapper.java index fd8f1e31..e18d6a68 100644 --- a/src/com/engine/organization/mapper/resource/ResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/ResourceMapper.java @@ -1,6 +1,7 @@ package com.engine.organization.mapper.resource; +import com.engine.organization.entity.hrmresource.po.HrmResourcePO; import com.engine.organization.entity.hrmresource.vo.HrmResourceVO; import org.apache.ibatis.annotations.Param; @@ -15,4 +16,10 @@ import java.util.List; public interface ResourceMapper { List listAll(@Param("ids")List ids); + + List getResourceListByJobId(@Param("jobId") Long jobId); + + int updateResourceJob(@Param("originalJobId") Long originalJobId, @Param("targetJobId") Long targetJobId, @Param("parentComp") Long parentComp, @Param("parentDept") Long parentDept, @Param("ecCompany") Long ecCompany, @Param("ecDepartment") Long ecDepartment); + + HrmResourcePO getResourceById(@Param("id") String id); } diff --git a/src/com/engine/organization/mapper/resource/ResourceMapper.xml b/src/com/engine/organization/mapper/resource/ResourceMapper.xml index 4435d9dc..8a729a69 100644 --- a/src/com/engine/organization/mapper/resource/ResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/ResourceMapper.xml @@ -1,13 +1,56 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - id,last_name,department_id,company_id,mobile,telephone,manager_id + t.id,t.work_code,t.last_name,t.sex,t.status,t.account_type, + t.belong_to,t.ec_company,t.job_title,t.ec_department,t. + scheme_id,t.sequence_id,t.job_grade,t.job_level,t.job_group_id, + t.job_activity,t.location_id,t.show_order,t.company_start_date, + t.work_start_date,t.job_activity_desc,t.resource_image_id,t.mobile, + t.telephone,t.email,t.uuid + + update jcl_org_hrmresource + + job_title = #{targetJobId}, + company_id = #{parentComp}, + department_id = #{parentDept}, + ec_company = #{ecCompany}, + ec_department = #{ecDepartment}, + + where delete_type = 0 and job_title =#{originalJobId} + + + @@ -56,7 +110,7 @@ - AND t.last_name like '%'||#{param.lastName}||'%' + AND t.last_name like '%'||#{param.lastName}||'%' @@ -66,5 +120,4 @@ - \ No newline at end of file diff --git a/src/com/engine/organization/mapper/scheme/GradeMapper.java b/src/com/engine/organization/mapper/scheme/GradeMapper.java index 69996684..7495bfb8 100644 --- a/src/com/engine/organization/mapper/scheme/GradeMapper.java +++ b/src/com/engine/organization/mapper/scheme/GradeMapper.java @@ -91,4 +91,5 @@ public interface GradeMapper { GradePO getGradeByLevelId(@Param("levelId") long levelId); + int checkRepeatNo(@Param("schemeId") Long schemeId, @Param("no") String no, @Param("id") Long id); } diff --git a/src/com/engine/organization/mapper/scheme/GradeMapper.xml b/src/com/engine/organization/mapper/scheme/GradeMapper.xml index eecd8dc8..e1f6ea45 100644 --- a/src/com/engine/organization/mapper/scheme/GradeMapper.xml +++ b/src/com/engine/organization/mapper/scheme/GradeMapper.xml @@ -245,9 +245,20 @@ + concat(',', level_id, ',') like concat('%,', cast(#{levelId} as CHAR), ',%') diff --git a/src/com/engine/organization/mapper/scheme/LevelMapper.java b/src/com/engine/organization/mapper/scheme/LevelMapper.java index eaa33e9b..11b5f460 100644 --- a/src/com/engine/organization/mapper/scheme/LevelMapper.java +++ b/src/com/engine/organization/mapper/scheme/LevelMapper.java @@ -98,4 +98,6 @@ public interface LevelMapper { ArrayList getTreeData(); List getLevelsByIds(@Param("ids")Collection ids); + + int checkRepeatNo(@Param("schemeId") Long schemeId, @Param("no") String no, @Param("id") Long id); } diff --git a/src/com/engine/organization/mapper/scheme/LevelMapper.xml b/src/com/engine/organization/mapper/scheme/LevelMapper.xml index bde2f5f0..116e2e90 100644 --- a/src/com/engine/organization/mapper/scheme/LevelMapper.xml +++ b/src/com/engine/organization/mapper/scheme/LevelMapper.xml @@ -89,6 +89,17 @@ #{id} + update jcl_org_level diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml index 38a28827..55ca3517 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml @@ -77,7 +77,7 @@ - - + select + + from jcl_org_hrmresource t + inner join hrmresource a on t.uuid = a.uuid + where t.delete_type = 0 and a.id = #{ecId} \ No newline at end of file diff --git a/src/com/engine/organization/mapper/trigger/GroupTriggerMapper.xml b/src/com/engine/organization/mapper/trigger/GroupTriggerMapper.xml index d204f765..41087495 100644 --- a/src/com/engine/organization/mapper/trigger/GroupTriggerMapper.xml +++ b/src/com/engine/organization/mapper/trigger/GroupTriggerMapper.xml @@ -3,7 +3,7 @@ update jcl_org_map - set fdateend=dateadd(day,-1, #{fdate}) + set fdateend=#{fdate} where fobjid = #{fobjid} and fdateend > #{fdatebegin} diff --git a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java index 0125a2cd..2d4d3011 100644 --- a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java +++ b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java @@ -1,9 +1,10 @@ package com.engine.organization.mapper.trigger; -import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; import weaver.hrm.passwordprotection.domain.HrmResource; +import java.util.List; + /** * @author:dxfeng * @createTime: 2022/09/01 @@ -12,6 +13,8 @@ import weaver.hrm.passwordprotection.domain.HrmResource; public interface HrmResourceTriggerMapper { HrmResource getHrmResource(@Param("id") Long id); - JSONObject getCusFieldDataById(@Param("fObjId") Integer fObjId); + List getFidsByFleader(@Param("fLeader") String fLeader, @Param("currentDate") String currentDate); + + int updateLeaders(@Param("currentDate") String currentDate,@Param("fLeader") String fLeader, @Param("fLeaderImg") String fLeaderImg, @Param("fLeaderName") String fLeaderName, @Param("fLeaderJobId") Integer fLeaderJobId, @Param("fLeaderJob") String fLeaderJob, @Param("fLeaderLv") String fLeaderLv, @Param("fLeaderSt") String fLeaderSt); } diff --git a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml index 37649663..cd09e5ac 100644 --- a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml +++ b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.xml @@ -1,17 +1,31 @@ + + update jcl_org_map + + fleaderimg = #{fLeaderImg}, + fleadername = #{fLeaderName}, + fleaderjobid = #{fLeaderJobId}, + fleaderjob = #{fLeaderJob}, + fleaderlv = #{fLeaderLv}, + fleaderst = #{fLeaderSt}, + + where fleader = #{fLeader} AND fdatebegin <= #{currentDate} + AND fdateend >= #{currentDate} + - + SELECT fid + FROM jcl_org_map + WHERE FLEADER = #{fLeader} + AND FDATEBEGIN <= #{currentDate} + AND FDATEEND >= #{currentDate} \ No newline at end of file diff --git a/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.java b/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.java new file mode 100644 index 00000000..20652df2 --- /dev/null +++ b/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.java @@ -0,0 +1,34 @@ +package com.engine.organization.mapper.trigger; + +import org.apache.ibatis.annotations.Param; + +/** + * @author:dxfeng + * @createTime: 2022/09/21 + * @version: 1.0 + */ +public interface StaffTriggerMapper { + //Integer countCompanyUsers(@Param("ecCompanyId") String ecCompanyId); + + //Integer countDepartmentUsers(@Param("ecDepartmentId") String ecDepartmentId); + + //Integer countJobUsers(@Param("jobTitle") String jobTitle); + + Integer countOnJobByJObId(@Param("jobId") String jobId); + + //Integer countAllUsers(); + + Integer countCompanyStaffNum(@Param("currentDate") String currentDate, @Param("companyId") String companyId); + + Integer countDepartmentStaffNum(@Param("currentDate") String currentDate, @Param("departmentId") String departmentId); + + Integer countJobStaffNum(@Param("currentDate") String currentDate, @Param("jobId") String jobId); + + Integer updateOrgStaffs(@Param("currentDate") String currentDate, @Param("fType") String fType, @Param("fObjId") String fObjId, @Param("fPlan") Integer fPlan, @Param("fOnJob") Integer fOnJob); + + String getIdByObjIdAndType(@Param("currentDate") String currentDate, @Param("fObjId") String fObjId, @Param("fType") String fType); + + Integer sumPlanByParentId(@Param("currentDate") String currentDate, @Param("parentId") String parentId); + + Integer sumOnJobByParentId(@Param("currentDate") String currentDate, @Param("parentId") String parentId); +} diff --git a/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml b/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml new file mode 100644 index 00000000..59c84dd5 --- /dev/null +++ b/src/com/engine/organization/mapper/trigger/StaffTriggerMapper.xml @@ -0,0 +1,103 @@ + + + + + update jcl_org_map + + FPLAN = #{fPlan}, + FONJOB = #{fOnJob}, + + where FTYPE =#{fType} and FOBJID=#{fObjId} + AND FDATEBEGIN <= #{currentDate} + AND FDATEEND >= #{currentDate} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/organization/service/CompService.java b/src/com/engine/organization/service/CompService.java index 7ac016f7..fede7178 100644 --- a/src/com/engine/organization/service/CompService.java +++ b/src/com/engine/organization/service/CompService.java @@ -3,6 +3,7 @@ package com.engine.organization.service; import com.api.browser.bean.SearchConditionGroup; import com.engine.organization.entity.company.param.CompSearchParam; import com.engine.organization.entity.department.param.DepartmentMoveParam; +import com.engine.organization.util.MenuBtn; import java.util.Collection; import java.util.List; @@ -69,7 +70,7 @@ public interface CompService { * * @return */ - Map getHasRight(); + Map> getHasRight(); /** * 获取基本信息表单 diff --git a/src/com/engine/organization/service/DepartmentService.java b/src/com/engine/organization/service/DepartmentService.java index a3d382e0..d405d497 100644 --- a/src/com/engine/organization/service/DepartmentService.java +++ b/src/com/engine/organization/service/DepartmentService.java @@ -5,6 +5,7 @@ import com.engine.organization.entity.department.param.*; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; import com.engine.organization.entity.job.vo.SingleJobTreeVO; import com.engine.organization.entity.searchtree.SearchTreeParams; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.page.PageInfo; import java.util.Collection; @@ -97,7 +98,7 @@ public interface DepartmentService { * * @return */ - Map getHasRight(); + Map> getHasRight(); /** * 获取基本信息表单 @@ -113,7 +114,7 @@ public interface DepartmentService { * * @return */ - Map getSaveForm(); + Map getSaveForm(DeptSearchParam param); /** * 复制表单 diff --git a/src/com/engine/organization/service/ExtService.java b/src/com/engine/organization/service/ExtService.java index 2b848726..2f53be80 100644 --- a/src/com/engine/organization/service/ExtService.java +++ b/src/com/engine/organization/service/ExtService.java @@ -38,7 +38,7 @@ public interface ExtService { * @param groupId * @return */ - List getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType, String... readOnlyFields); + List getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType, Map params, String... readOnlyFields); /** * 组装明细表表单 @@ -51,7 +51,7 @@ public interface ExtService { * @param showLabel * @return */ - List> getExtendTables(User user, String extendType, Long groupId,String tableName, long id, int viewAttr, boolean showLabel); + List> getExtendTables(User user, String extendType, Long groupId, String tableName, long id, int viewAttr, boolean showLabel); /** * 拓展页面分组 * diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 381e74f0..fd25ed4d 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -114,4 +114,6 @@ public interface FieldDefinedService { * @param param */ void changeGroup(ExtendInfoChangeParam param); + + Map getHasRight(ModuleTypeEnum moduleTypeEnum); } diff --git a/src/com/engine/organization/service/GradeService.java b/src/com/engine/organization/service/GradeService.java index 46a59c2c..77f1396b 100644 --- a/src/com/engine/organization/service/GradeService.java +++ b/src/com/engine/organization/service/GradeService.java @@ -1,8 +1,10 @@ package com.engine.organization.service; import com.engine.organization.entity.scheme.param.GradeSearchParam; +import com.engine.organization.util.MenuBtn; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -70,7 +72,7 @@ public interface GradeService { * 获取列表页面按钮信息 * @return */ - Map getHasRight(); + Map> getHasRight(); /** * 获取列表tabs diff --git a/src/com/engine/organization/service/HrmPersonnelCardService.java b/src/com/engine/organization/service/HrmPersonnelCardService.java new file mode 100644 index 00000000..f12888b1 --- /dev/null +++ b/src/com/engine/organization/service/HrmPersonnelCardService.java @@ -0,0 +1,28 @@ +package com.engine.organization.service; + +import com.engine.organization.entity.personnelcard.Iframe; + +import java.util.List; +import java.util.Map; + +/** + * @author:dxfeng + * @createTime: 2022/10/08 + * @version: 1.0 + */ +public interface HrmPersonnelCardService { + /** + * 获取人事卡片信息 + * + * @param uId + * @return + */ + Map getPersonnelCard(Long uId); + + /** + * 获取人事自定义显示栏目 + * + * @return + */ + List