diff --git a/docs/初始数据SQL/jcl_field_extendgroup.sql b/docs/初始数据SQL/jcl_field_extendgroup.sql index 6dd1fc25..f5febd8a 100644 --- a/docs/初始数据SQL/jcl_field_extendgroup.sql +++ b/docs/初始数据SQL/jcl_field_extendgroup.sql @@ -12,4 +12,4 @@ INSERT INTO jcl_field_extendgroup VALUES(4, 4, '基本信息', 1, 0, '2022-06-17', '2022-06-17', NULL, '1', 1, 0); INSERT INTO jcl_field_extendgroup (id, extend_type, group_name, creator, delete_type, create_time, update_time, pid, is_show, show_order, is_system_default) -VALUES(5, 3, '职务', 1, 0, '2022-07-05', '2022-07-05', 3, '1', 1, 1); +VALUES(5, 3, '职务', 1, 0, '2022-07-05', '2022-07-05', 3, '1', 1, 0); diff --git a/docs/初始数据SQL/jcl_field_extendinfo.sql b/docs/初始数据SQL/jcl_field_extendinfo.sql index 2a2e56a7..7ed9bbfc 100644 --- a/docs/初始数据SQL/jcl_field_extendinfo.sql +++ b/docs/初始数据SQL/jcl_field_extendinfo.sql @@ -1,93 +1,300 @@ 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, NULL, NULL, '1', '["input","text","100"]', 0); +VALUES(1, 1, 'JCL_ORG_COMP', 'comp_no', '编号', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, '2022-06-22', 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(2, 1, 'JCL_ORG_COMP', 'comp_name', '名称', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0); +VALUES(2, 1, 'JCL_ORG_COMP', 'comp_name', '名称', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, '2022-06-22', 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, 4, 1, 0, NULL, 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); +VALUES(3, 1, 'JCL_ORG_COMP', 'parent_company', '上级公司', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, '2022-06-22', 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(4, 1, 'JCL_ORG_COMP', 'industry', '行业', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, NULL, NULL, '63', NULL, 0); +VALUES(4, 1, 'JCL_ORG_COMP', 'industry', '行业', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 8, 1, 0, '2022-06-22', 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, 3, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0); +VALUES(5, 1, 'JCL_ORG_COMP', 'comp_name_short', '简称', 'varchar(100)', 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 0, '2022-06-22', 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(6, 1, 'JCL_ORG_COMP', 'org_code', '组织机构代码', 'varchar(100)', 1, 1, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0); +VALUES(6, 1, 'JCL_ORG_COMP', 'org_code', '组织机构代码', 'varchar(100)', 1, 1, 1, 0, 1, 1, 1, 1, 1, 7, 1, 0, '2022-06-22', 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(7, 1, 'JCL_ORG_COMP', 'comp_principal', '负责人', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 7, 1, 0, NULL, NULL, '1', NULL, 0); +VALUES(7, 1, 'JCL_ORG_COMP', 'comp_principal', '负责人', 'int', 3, 1, 1, 0, 1, 1, 1, 1, 1, 9, 1, 0, '2022-06-22', 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(8, 1, 'JCL_ORG_COMP', 'description', '说明', 'text', 2, 1, 1, 0, 1, 0, 1, 0, 1, 8, 1, 0, NULL, NULL, NULL, NULL, 0); +VALUES(8, 1, 'JCL_ORG_COMP', 'description', '说明', 'text', 2, 1, 1, 0, 1, 0, 1, 0, 1, 10, 1, 0, '2022-06-22', 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(9, 1, 'JCL_ORG_COMP', 'forbidden_tag', '禁用标记', 'int', 5, 1, 1, 0, 1, 1, 0, 0, 1, 9, 1, 0, NULL, NULL, '', '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"启用"},{"default":"","unuse":"0","id":"1","key":"1","option":"禁用"}],"sort":"horizontal"}]', 0); +VALUES(9, 1, 'JCL_ORG_COMP', 'forbidden_tag', '禁用标记', 'int', 5, 1, 1, 0, 1, 1, 0, 0, 1, 11, 1, 0, '2022-06-22', NULL, '', '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"启用"},{"default":"","unuse":"0","id":"1","key":"1","option":"禁用"}],"sort":"horizontal"}]', 0); INSERT INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) -VALUES(10, 2, 'JCL_ORG_DEPT', 'dept_no', '编号', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0); +VALUES(10, 1, 'JCL_ORG_COMP', 'show_order', '显示顺序', 'int', 1, 1, 1, 0, 1, NULL, 1, 1, 1, 12, 1, 0, '2022-06-22', 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(11, 2, 'JCL_ORG_DEPT', 'dept_name', '名称', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, NULL, NULL, '1', NULL, 0); +VALUES(11, 2, 'JCL_ORG_DEPT', 'dept_no', '编号', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, '2022-06-22', 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_short', '简称', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, NULL, NULL, '1', NULL, 0); +VALUES(12, 2, 'JCL_ORG_DEPT', 'dept_name', '名称', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, '2022-06-22', 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', 'parent_comp', '所属分部', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 4, 1, 0, NULL, 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); +VALUES(13, 2, 'JCL_ORG_DEPT', 'dept_name_short', '简称', 'varchar(100)', 1, 2, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, '2022-06-22', 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_dept', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, NULL, 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); +VALUES(14, 2, 'JCL_ORG_DEPT', 'parent_comp', '所属分部', 'int', 3, 2, 1, 1, 1, 1, 1, 1, 1, 4, 1, 0, '2022-06-22', 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', 'dept_principal', '部门负责人', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, NULL, NULL, '1', NULL, 0); +VALUES(15, 2, 'JCL_ORG_DEPT', 'parent_dept', '上级部门', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, '2022-06-22', 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', 'show_order', '显示顺序', 'int', 1, 2, 1, 0, 1, 1, 1, 1, 1, 7, 1, 0, NULL, NULL, '2', NULL, 0); +VALUES(16, 2, 'JCL_ORG_DEPT', 'dept_principal', '部门负责人', 'int', 3, 2, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, '2022-06-22', 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', 'description', '说明', 'text', 2, 2, 1, 0, 1, 1, 1, 0, 1, 7, 1, 0, NULL, NULL, NULL, NULL, 0); +VALUES(17, 2, 'JCL_ORG_DEPT', 'show_order', '显示顺序', 'int', 1, 2, 1, 0, 1, 1, 1, 1, 1, 7, 1, 0, '2022-06-22', 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', 'forbidden_tag', '禁用标记', 'int', 5, 2, 1, 0, 1, 1, 0, 0, 1, 7, 1, 0, NULL, NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"启用"},{"default":"","unuse":"0","id":"1","key":"1","option":"禁用"}],"sort":"horizontal"}]', 0); +VALUES(18, 2, 'JCL_ORG_DEPT', 'description', '说明', 'text', 2, 2, 1, 0, 1, 1, 1, 0, 1, 8, 1, 0, '2022-06-22', 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(19, 3, 'JCL_ORG_JOB', 'job_no', '编号', 'varchar(100)', 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0); +VALUES(19, 2, 'JCL_ORG_DEPT', 'forbidden_tag', '禁用标记', 'int', 5, 2, 1, 0, 1, 1, 0, 0, 1, 9, 1, 0, '2022-06-22', NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"启用"},{"default":"","unuse":"0","id":"1","key":"1","option":"禁用"}],"sort":"horizontal"}]', 0); INSERT INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) -VALUES(20, 3, 'JCL_ORG_JOB', 'job_name', '名称', 'varchar(100)', 1, 3, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0); +VALUES(20, 3, 'JCL_ORG_JOB', 'job_no', '编号', 'varchar(100)', 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, '2022-07-05', 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(21, 3, 'JCL_ORG_JOB', 'parent_comp', '所属分部', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 3, 1, 0, NULL, 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); +VALUES(21, 3, 'JCL_ORG_JOB', 'sequence_id', '岗位序列', 'int', 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, '2022-07-05', NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"sequenceBrowser","valueSpan":"岗位序列","replaceDatas":[{"showname":"sequenceBrowser","shownamespan":"sequenceBrowser","namespan":"岗位序列","name":"岗位序列","showtypespan":"列表式","randomFieldIdspan":"","showtype":"1","randomFieldId":"sequenceBrowser","id":"sequenceBrowser"}]}]', 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(22, 3, 'JCL_ORG_JOB', 'parent_dept', '所属部门', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 4, 1, 0, NULL, 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); +VALUES(22, 3, 'JCL_ORG_JOB', 'description', '工作概述', 'text', 2, 6, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, '2022-07-05', 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(23, 3, 'JCL_ORG_JOB', 'sequence_id', '岗位序列', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, NULL, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"sequenceBrowser","valueSpan":"岗位序列","replaceDatas":[{"showname":"sequenceBrowser","shownamespan":"sequenceBrowser","namespan":"岗位序列","name":"岗位序列","showtypespan":"列表式","randomFieldIdspan":"","showtype":"1","randomFieldId":"sequenceBrowser","id":"sequenceBrowser"}]}]', 0); +VALUES(23, 3, 'JCL_ORG_JOB', 'job_name', '名称', 'varchar(100)', 1, 3, 1, 0, 1, 1, 1, 1, 1, 2, 1, 0, '2022-07-05', 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(24, 3, 'JCL_ORG_JOB', 'scheme_id', '等级方案', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, NULL, NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"schemeBrowser","valueSpan":"等级方案浏览按钮","replaceDatas":[{"showname":"schemeBrowser","shownamespan":"schemeBrowser","namespan":"等级方案浏览按钮","name":"等级方案浏览按钮","showtypespan":"列表式","randomFieldIdspan":"","showtype":"1","randomFieldId":"schemeBrowser","id":"schemeBrowser"}]}]', 0); +VALUES(24, 3, 'JCL_ORG_JOB', 'scheme_id', '等级方案', 'int', 3, 5, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, '2022-07-05', NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"schemeBrowser","valueSpan":"等级方案浏览按钮","replaceDatas":[{"showname":"schemeBrowser","shownamespan":"schemeBrowser","namespan":"等级方案浏览按钮","name":"等级方案浏览按钮","showtypespan":"列表式","randomFieldIdspan":"","showtype":"1","randomFieldId":"schemeBrowser","id":"schemeBrowser"}]}]', 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(25, 3, 'JCL_ORG_JOB', 'parent_job', '上级岗位', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 7, 1, 0, NULL, 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); +VALUES(25, 3, 'JCL_ORG_JOB', 'work_duty', '任职职责', 'text', 2, 6, 1, 0, 1, 1, 1, 0, 1, 2, 1, 0, '2022-07-05', NULL, NULL, NULL, 0); INSERT INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) -VALUES(26, 3, 'JCL_ORG_JOB', 'is_key', '是否关键岗', 'int', 5, 3, 1, 0, 1, 1, 1, 1, 1, 8, 1, 0, NULL, NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"否"},{"default":"","unuse":"0","id":"1","key":"1","option":"是"}],"sort":"horizontal"}]', 0); +VALUES(26, 3, 'JCL_ORG_JOB', 'ec_department', '所属部门', 'int', 3, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, '2022-07-05', 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', 'workplace', '工作地点', 'varchar(100)', 1, 3, 1, 0, 1, 1, 1, 0, 1, 9, 1, 0, NULL, NULL, '1', '["input","text","100"]', 0); +VALUES(27, 3, 'JCL_ORG_JOB', 'work_authority', '工作权限', 'text', 2, 6, 1, 0, 1, 1, 1, 0, 1, 3, 1, 0, '2022-07-05', 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', 'description', '工作概述', 'text', 2, 3, 1, 0, 1, 1, 1, 0, 1, 10, 1, 0, NULL, NULL, NULL, NULL, 0); +VALUES(28, 3, 'JCL_ORG_JOB', 'level_id', '职等', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 3, 1, 0, '2022-07-05', 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', 'work_duty', '任职职责', 'text', 2, 3, 1, 0, 1, 1, 1, 0, 1, 11, 1, 0, NULL, NULL, NULL, NULL, 0); +VALUES(29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 4, 1, 0, '2022-07-05', 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', 'work_authority', '工作权限', 'text', 2, 3, 1, 0, 1, 1, 1, 0, 1, 12, 1, 0, NULL, NULL, NULL, NULL, 0); +VALUES(30, 3, 'JCL_ORG_JOB', 'grade_id', '职级', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 4, 1, 0, '2022-07-05', 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', 'forbidden_tag', '禁用标记', 'int', 5, 3, 1, 0, 1, 1, 0, 0, 1, 13, 1, 0, NULL, NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"启用"},{"default":"","unuse":"0","id":"1","key":"1","option":"禁用"}],"sort":"horizontal"}]', 0); +VALUES(31, 3, 'JCL_ORG_JOB', 'parent_job', '上级岗位', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, '2022-07-05', 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, '2022-07-05', NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"否"},{"default":"","unuse":"0","id":"1","key":"1","option":"是"}],"sort":"horizontal"}]', 0); +INSERT INTO jcl_field_extendinfo +(id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) +VALUES(33, 3, 'JCL_ORG_JOB', 'workplace', '工作地点', 'varchar(100)', 1, 3, 1, 0, 1, 1, 1, 0, 1, 7, 1, 0, '2022-07-05', 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(34, 3, 'JCL_ORG_JOB', 'forbidden_tag', '禁用标记', 'int', 5, 3, 1, 0, 1, 1, 0, 0, 1, 8, 1, 0, '2022-07-05', NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"启用"},{"default":"","unuse":"0","id":"1","key":"1","option":"禁用"}],"sort":"horizontal"}]', 0); +INSERT INTO jcl_field_extendinfo +(id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) +VALUES(35, 3, 'JCL_ORG_JOB', 'show_order', '显示顺序', 'int', 1, 3, 1, 0, 1, NULL, 1, 1, 1, 9, 1, 0, '2022-07-05', 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(36, 3, 'JCL_ORG_JOB', 'parent_comp', '所属分部', 'int', 3, 3, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, '2022-06-22', 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(37, 3, 'JCL_ORG_JOB', 'parent_dept', '上级部门', 'int', 3, 3, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, '2022-06-22', 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(38, 3, 'JCL_ORG_JOBEXT_DT1', 'post_id', '职务分类', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 1, 1, 0, '2022-07-05', NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"itemorderid":"161","name":"自定义单选","id":"161","parenttitle":"集成","title":"集成-自定义单选"}],"value":"161"},{"valueSpan":"职务分类浏览按钮","replaceDatas":[{"showname":"postBrowser","name":"职务分类浏览按钮","id":"postBrowser"}],"value":"postBrowser"}]', 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(39, 3, 'JCL_ORG_JOBEXT_DT1', 'post_info_id', '职务', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 2, 1, 0, '2022-07-05', NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"itemorderid":"161","name":"自定义单选","id":"161","parenttitle":"集成","title":"集成-自定义单选"}],"value":"161"},{"valueSpan":"职务信息浏览按钮","replaceDatas":[{"showname":"PostInfoBrowser","name":"职务信息浏览按钮","id":"PostInfoBrowser"}],"value":"PostInfoBrowser"}]', 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(40, 4, 'JCL_ORG_HRMRESOURCE', 'work_code', '编号', 'varchar(60)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 1, 1, 0, '2022-06-21', NULL, '1', '["input","text","60"]', 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(41, 4, 'JCL_ORG_HRMRESOURCE', 'manager_id', '直接上级', 'int', 3, 7, 1, 0, 1, NULL, 1, 1, 1, 1, 1, 0, '2022-06-21', NULL, '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"itemorderid":"1","name":"人力资源","id":"1","parenttitle":"人员","title":"人员-人力资源"}],"value":"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(42, 4, 'JCL_ORG_HRMRESOURCE', 'mobile', '移动电话', 'varchar(60)', 1, 8, 1, 0, 1, NULL, 1, 1, 1, 1, 1, 0, '2022-06-21', NULL, '1', '["input","text","60"]', 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(43, 4, 'JCL_ORG_HRMRESOURCE', 'login_id', '登录名', 'varchar(60)', 1, 4, 1, 1, 1, NULL, 1, 1, 1, 2, 1, 0, '2022-06-21', NULL, '1', '["input","text","60"]', 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(44, 4, 'JCL_ORG_HRMRESOURCE', 'assistant_id', '助理', 'int', 3, 7, 1, 0, 1, NULL, 1, 1, 1, 2, 1, 0, '2022-06-21', NULL, '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"itemorderid":"1","name":"人力资源","id":"1","parenttitle":"人员","title":"人员-人力资源"}],"value":"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(45, 4, 'JCL_ORG_HRMRESOURCE', 'telephone', '办公室电话', 'varchar(60)', 1, 8, 1, 0, 1, NULL, 1, 1, 1, 2, 1, 0, '2022-06-21', NULL, '1', '["input","text","60"]', 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(46, 4, 'JCL_ORG_HRMRESOURCE', 'last_name', '姓名', 'varchar(60)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 3, 1, 0, '2022-06-21', NULL, '1', '["input","text","60"]', 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(47, 4, 'JCL_ORG_HRMRESOURCE', 'mobile_call', '其他电话', 'varchar(60)', 1, 8, 1, 0, 1, NULL, 1, 1, 1, 3, 1, 0, '2022-06-21', NULL, '1', '["input","text","60"]', 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(48, 4, 'JCL_ORG_HRMRESOURCE', 'sex', '性别', 'int', 5, 4, 1, 0, 1, NULL, 1, 1, 1, 4, 1, 0, '2022-06-21', NULL, '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 +(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(49, 4, 'JCL_ORG_HRMRESOURCE', 'fax', '传真', 'varchar(60)', 1, 8, 1, 0, 1, NULL, 1, 1, 1, 4, 1, 0, '2022-06-21', NULL, '1', '["input","text","60"]', 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(50, 4, 'JCL_ORG_HRMRESOURCE', 'account_type', '账号类型', 'int', 5, 4, 1, 0, 1, NULL, 1, 1, 1, 5, 1, 0, '2022-06-21', NULL, '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 +(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(51, 4, 'JCL_ORG_HRMRESOURCE', 'email', '电子邮件', 'varchar(60)', 1, 8, 1, 0, 1, NULL, 1, 1, 1, 5, 1, 0, '2022-06-21', NULL, '1', '["input","text","60"]', 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(52, 4, 'JCL_ORG_HRMRESOURCE', 'belong_to', '主账号', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 6, 1, 0, '2022-06-21', NULL, '1', '["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"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(53, 4, 'JCL_ORG_HRMRESOURCE', 'workroom', '办公室', 'varchar(60)', 1, 8, 1, 0, 1, NULL, 1, 1, 1, 6, 1, 0, '2022-06-21', NULL, '1', '["input","text","60"]', 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(54, 4, 'JCL_ORG_HRMRESOURCE', 'department_id', '部门', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 7, 1, 0, '2022-06-21', 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(55, 4, 'JCL_ORG_HRMRESOURCE', 'job_activity', '职务', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 8, 1, 0, '2022-06-21', NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务分类浏览按钮","replaceDatas":[{"showname":"postBrowser","shownamespan":"postBrowser","namespan":"职务分类浏览按钮","name":"职务分类浏览按钮","showtypespan":"列表式","randomFieldIdspan":"","showtype":"1","id":"postBrowser","randomFieldId":"postBrowser"}],"value":"postBrowser"}]', 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(56, 4, 'JCL_ORG_HRMRESOURCE', 'job_title', '岗位', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 9, 1, 0, '2022-06-21', 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(57, 4, 'JCL_ORG_HRMRESOURCE', 'job_call', '职称', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 10, 1, 0, '2022-06-21', NULL, '260', '["browser",{"valueSpan":"职称","replaceDatas":[{"name":"职称","id":"260"}],"value":"260"}]', 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(58, 4, 'JCL_ORG_HRMRESOURCE', 'job_level', '职级', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 11, 1, 0, '2022-06-21', NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"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(59, 4, 'JCL_ORG_HRMRESOURCE', 'job_group_id', '职务类别', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 12, 1, 0, '2022-06-21', NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"职务分类浏览按钮","replaceDatas":[{"showname":"postBrowser","name":"职务分类浏览按钮","id":"postBrowser"}],"value":"postBrowser"}]', 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(60, 4, 'JCL_ORG_HRMRESOURCE', 'job_activity_desc', '职责描述', 'varchar(200)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 13, 1, 0, '2022-06-21', NULL, '1', '["input","text","200"]', 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(61, 4, 'JCL_ORG_HRMRESOURCE', 'status', '状态', 'int', 5, 4, 1, 0, 1, NULL, 1, 1, 1, 14, 1, 0, '2022-06-21', NULL, '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 +(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(62, 4, 'JCL_ORG_HRMRESOURCE', 'system_language', '系统语言', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 15, 1, 0, '2022-06-21', NULL, '259', '["browser",{"valueSpan":"语言","replaceDatas":[{"itemorderid":"259","name":"语言","id":"259","parenttitle":"系统","title":"系统-语言"}],"value":"259"}]', 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(63, 4, 'JCL_ORG_HRMRESOURCE', 'resource_image_id', '照片', 'varchar(1000)', 6, 4, 1, 0, 1, NULL, 1, 1, 1, 16, 1, 0, '2022-06-21', NULL, '1', '["upload","file"]', 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(64, 4, 'JCL_ORG_HRMRESOURCE', 'messager_url', '头像', 'varchar(1000)', 6, 4, 1, 0, 1, NULL, 1, 1, 1, 17, 1, 0, '2022-06-21', NULL, '1', '["upload","file"]', 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(65, 4, 'JCL_ORG_HRMRESOURCE', 'location_id', '办公地点', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 18, 1, 0, '2022-06-21', NULL, '262', '["browser",{"valueSpan":"办公地点","replaceDatas":[{"itemorderid":"262","name":"办公地点","id":"262","parenttitle":"组织","title":"组织-办公地点"}],"value":"262"}]', 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(66, 4, 'JCL_ORG_HRMRESOURCE', 'company_id', '分部', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 19, 1, 0, '2022-06-21', NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"name":"自定义单选","id":"161"}],"value":"161"},{"valueSpan":"公司分部浏览按钮","replaceDatas":[{"showname":"compBrowser","name":"公司分部浏览按钮","id":"compBrowser"}],"value":"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(67, 4, 'JCL_ORG_HRMRESOURCE', 'pass_word', '密码', 'varchar(100)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 20, 1, 0, '2022-06-29', 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(68, 4, 'JCL_ORG_HRMRESOURCE', 'sec_level', '安全级别', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 21, 1, 0, '2022-06-29', 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(69, 4, 'JCL_ORG_HRMRESOURCE', 'birthday', '出生日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 22, 1, 0, '2022-06-29', NULL, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"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(70, 4, 'JCL_ORG_HRMRESOURCE', 'folk', '民族', 'varchar(30)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 23, 1, 0, '2022-06-29', NULL, '1', '["input","text","30"]', 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(71, 4, 'JCL_ORG_HRMRESOURCE', 'native_place', '籍贯', 'varchar(100)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 24, 1, 0, '2022-06-29', 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(72, 4, 'JCL_ORG_HRMRESOURCE', 'reg_resident_place', '户口', 'varchar(200)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 25, 1, 0, '2022-06-29', NULL, '1', '["input","text","200"]', 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(73, 4, 'JCL_ORG_HRMRESOURCE', 'certificate_num', '身份证号码', 'varchar(60)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 26, 1, 0, '2022-06-29', NULL, '1', '["input","text","60"]', 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(74, 4, 'JCL_ORG_HRMRESOURCE', 'marital_status', '婚姻状况', 'int', 5, 4, 1, 0, 1, NULL, 1, 1, 1, 27, 1, 0, '2022-06-29', NULL, '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 +(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(75, 4, 'JCL_ORG_HRMRESOURCE', 'policy', '政治面貌', 'varchar(30)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 28, 1, 0, '2022-06-29', NULL, '1', '["input","text","30"]', 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(76, 4, 'JCL_ORG_HRMRESOURCE', 'be_member_date', '入团日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 29, 1, 0, '2022-06-29', NULL, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"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(77, 4, 'JCL_ORG_HRMRESOURCE', 'be_party_date', '入党日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 30, 1, 0, '2022-06-29', NULL, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"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(78, 4, 'JCL_ORG_HRMRESOURCE', 'islabouunion', '工会会员', 'int', 5, 4, 1, 0, 1, NULL, 1, 1, 1, 31, 1, 0, '2022-06-29', NULL, '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 +(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(79, 4, 'JCL_ORG_HRMRESOURCE', 'education_level', '学历', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 32, 1, 0, '2022-06-29', NULL, '30', '["browser",{"valueSpan":"学历","replaceDatas":[{"name":"学历","id":"30"}],"value":"30"}]', 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(80, 4, 'JCL_ORG_HRMRESOURCE', 'degree', '学位', 'varchar(30)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 33, 1, 0, '2022-06-29', NULL, '1', '["input","text","30"]', 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(81, 4, 'JCL_ORG_HRMRESOURCE', 'health_info', '健康状况', 'int', 5, 4, 1, 0, 1, NULL, 1, 1, 1, 34, 1, 0, '2022-06-29', NULL, '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 +(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(82, 4, 'JCL_ORG_HRMRESOURCE', 'height', '身高', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 35, 1, 0, '2022-06-29', 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(83, 4, 'JCL_ORG_HRMRESOURCE', 'weight', '体重', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 36, 1, 0, '2022-06-29', 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(84, 4, 'JCL_ORG_HRMRESOURCE', 'use_kind', '用工性质', 'int', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 37, 1, 0, '2022-06-29', NULL, '31', '["browser",{"valueSpan":"用工性质","replaceDatas":[{"name":"用工性质","id":"31"}],"value":"31"}]', 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(85, 4, 'JCL_ORG_HRMRESOURCE', 'start_date', '合同开始日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 38, 1, 0, '2022-06-29', NULL, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"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(86, 4, 'JCL_ORG_HRMRESOURCE', 'end_date', '合同结束日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 39, 1, 0, '2022-06-29', NULL, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"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(87, 4, 'JCL_ORG_HRMRESOURCE', 'probation_end_date', '试用期结束日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 40, 1, 0, '2022-06-29', NULL, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"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(88, 4, 'JCL_ORG_HRMRESOURCE', 'resident_place', '现居住地', 'varchar(200)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 41, 1, 0, '2022-06-29', NULL, '1', '["input","text","200"]', 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(89, 4, 'JCL_ORG_HRMRESOURCE', 'home_address', '家庭联系方式', 'varchar(100)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 42, 1, 0, '2022-06-29', 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(90, 4, 'JCL_ORG_HRMRESOURCE', 'temp_resident_number', '暂住证号码', 'varchar(60)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 43, 1, 0, '2022-06-29', NULL, '1', '["input","text","60"]', 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(91, 4, 'JCL_ORG_HRMRESOURCE', 'company_start_date', '入职日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 44, 1, 0, '2022-06-29', NULL, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"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(92, 4, 'JCL_ORG_HRMRESOURCE', 'work_start_date', '参加工作日期', 'char(10)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 45, 1, 0, '2022-06-29', NULL, '2', '["browser",{"valueSpan":"日期","replaceDatas":[{"name":"日期","id":"2"}],"value":"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(93, 4, 'JCL_ORG_HRMRESOURCE', 'accum_fund_account', '公积金帐户', 'varchar(30)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 46, 1, 0, '2022-06-29', NULL, '1', '["input","text","30"]', 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(94, 4, 'JCL_ORG_HRMRESOURCE', 'account_name', '工资账号户名', 'varchar(200)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 48, 1, 0, '2022-06-29', NULL, '1', '["input","text","200"]', 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(95, 4, 'JCL_ORG_HRMRESOURCE', 'bank_id', '工资银行', 'varchar(400)', 3, 4, 1, 0, 1, NULL, 1, 1, 1, 49, 1, 0, '2022-06-29', NULL, '284', '["browser",{"valueSpan":"工资银行","replaceDatas":[{"itemorderid":"0","name":"工资银行","id":"284","parenttitle":"其他","title":"其他-工资银行"}],"value":"284"}]', 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(96, 4, 'JCL_ORG_HRMRESOURCE', 'account_id', '工资账号', 'varchar(100)', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 50, 1, 0, '2022-06-29', 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(97, 4, 'JCL_ORG_HRMRESOURCE', 'show_order', '显示顺序', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 51, 1, 0, '2022-06-29', 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(98, 4, 'JCL_ORG_HRMRESOURCE', 'classification', '人员密级', 'int', 1, 4, 1, 0, 1, NULL, 1, 1, 1, 52, 1, 0, '2022-06-29', 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, '2022-06-29', 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, '2022-06-29', NULL, '3', '["input","float","2"]', 0); diff --git a/docs/初始数据SQL/jcl_field_extendtitle.sql b/docs/初始数据SQL/jcl_field_extendtitle.sql index 41d57f77..dff1cba6 100644 --- a/docs/初始数据SQL/jcl_field_extendtitle.sql +++ b/docs/初始数据SQL/jcl_field_extendtitle.sql @@ -1,6 +1,6 @@ INSERT INTO jcl_field_extendtitle (id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default) -VALUES(1, 1, '基本信息', 1, 0, '2022-06-17', '2022-06-17', 1, 1, 0); +VALUES(1, 1, '基本信息', 1, 0, '2022-06-17', '2022-06-30', 1, 1, 0); INSERT INTO jcl_field_extendtitle (id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default) VALUES(2, 2, '基本信息', 1, 0, '2022-06-17', '2022-06-17', 1, 1, 0); @@ -10,3 +10,15 @@ VALUES(3, 3, '基本信息', 1, 0, '2022-06-17', '2022-06-17', 1, 1, 0); INSERT INTO jcl_field_extendtitle (id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default) VALUES(4, 4, '基本信息', 1, 0, '2022-06-17', '2022-06-17', 1, 1, 0); +INSERT INTO jcl_field_extendtitle +(id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default) +VALUES(5, 3, '职务信息', 1, 0, '2022-07-05', NULL, 2, 1, 0); +INSERT INTO jcl_field_extendtitle +(id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default) +VALUES(6, 3, '职责信息', 1, 0, '2022-07-05', NULL, 3, 1, 0); +INSERT INTO jcl_field_extendtitle +(id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default) +VALUES(7, 4, '上下级关系', 1, 0, '2022-06-21', NULL, 2, 1, 0); +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, '2022-06-21', NULL, 3, 1, 0); diff --git a/docs/初始数据SQL/浏览按钮.sql b/docs/初始数据SQL/浏览按钮.sql new file mode 100644 index 00000000..a2800c05 --- /dev/null +++ b/docs/初始数据SQL/浏览按钮.sql @@ -0,0 +1,46 @@ +INSERT INTO datashowset(`id`, `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 (7, 'schemeBrowser', '1', '1', '', 'select id,scheme_no ,scheme_name ,scheme_description from jcl_org_scheme where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '等级方案浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-11', '13:54:29', '2022-05-11', '14:34:38', '', '', '0', 'd2482569-d0ee-11ec-a80d-0250f2000002', '', '', '', '', '1', 0, 1); +INSERT INTO datashowset(`id`, `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 (8, 'LevelBrowser', '1', '1', '', 'select id,level_no ,level_name ,description ,scheme_id from jcl_org_level where delete_type =\'0\' and forbidden_tag =\'0\' and (scheme_id =$scheme_id$ or id in ($level_id$))', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职等浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-12', '10:44:12', '2022-07-12', '10:45:23', '', '', '0', '6847333b-d19d-11ec-9deb-0250f2000002', '', '', '', '', '1', 0, 1); +INSERT INTO datashowset(`id`, `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 (9, 'postBrowser', '1', '1', '', 'select id,post_name ,description from jcl_org_post jop where delete_type =\'0\'', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职务分类浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-16', '11:01:30', '2022-07-04', '14:52:14', '', '', '0', '7a1fed8a-d4c4-11ec-9deb-0250f2000002', '', '', '', '', '1', 0, 1); +INSERT INTO datashowset(`id`, `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 (10, 'compBrowser', '1', '1', '', 'select * from jcl_org_comp where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '2', 'id', 'parent_company', 'comp_name', '', '', '', '', 2, '公司分部浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-24', '14:49:23', '2022-05-24', '14:49:23', '', '', '0', 'a4b135d2-db2d-11ec-9deb-0250f2000002', '', '', '', '', '2', 0, 1); +INSERT INTO datashowset(`id`, `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 (21, 'deptBrowser', '1', '1', '', 'select * from jcl_org_dept where delete_type = 0 and forbidden_tag = 0 ', '', '', '', '', '2', 'id', 'parent_dept', 'dept_name', '', '', '', '', 2, '部门浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-31', '10:07:35', '2022-06-23', '19:01:47', '', '', '0', '706261ca-e086-11ec-b2c8-00e04c680716', '', '', '', '', '2', 0, 1); +INSERT INTO datashowset(`id`, `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 (22, 'sequenceBrowser', '1', '1', '', 'select *,scheme_id as scheme_value from jcl_org_sequence where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '岗位序列', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-31', '10:19:57', '2022-07-05', '13:33:40', '', '', '0', '2a80b572-e088-11ec-b2c8-00e04c680716', '', '', '', '', '1', 0, 1); +INSERT INTO datashowset(`id`, `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 (23, 'jobBrowser', '1', '1', '', 'select * from jcl_org_job where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '2', 'id', 'parent_job', 'job_name', '', '', '', '', 2, '岗位浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-31', '14:16:19', '2022-05-31', '14:16:19', '', '', '0', '2f9aecda-e0a9-11ec-b3da-149cd6593b1d', '', '', '', '', '2', 0, 1); +INSERT INTO datashowset(`id`, `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 (24, 'staffPlanBrowser', '1', '1', '', 'select * from jcl_org_staffplan', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '编制方案浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-06-07', '09:57:42', '2022-06-07', '09:57:42', '', '', '0', '37ec08ea-e605-11ec-b4aa-f5a55dde45bb', '', '', '', '', '1', 0, 1); +INSERT INTO datashowset(`id`, `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 (25, 'deptBrowserPrepare', '1', '1', '', 'select * from jcl_org_dept where delete_type = 0 and forbidden_tag = 0 and parent_comp = $parentComp$', '', '', '', '', '2', 'id', 'parent_dept', 'dept_name', '', '', '', '', 2, '部门浏览', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-06-24', '16:15:59', '2022-06-24', '16:15:59', '', '', '0', 'e12dac18-f395-11ec-a489-fc7142f7116e', '', '', '', '', '2', 0, 1); +INSERT INTO datashowset(`id`, `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 (26, 'gradeBrowser', '1', '1', '', 'select * from jcl_org_grade where delete_type = 0 and forbidden_tag = 0 and scheme_id = $scheme_id$', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职级浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-07-07', '14:10:39', '2022-07-12', '14:13:03', '', '', '0', '86756cc2-fdbb-11ec-9a53-e9994385d085', '', '', '', '', '1', 0, 1); + + + +INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (3, 'schemeBrowser', '0', 0, '2022-05-11', '13:54:29', '2022-05-11', '13:54:29'); +INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (4, 'LevelBrowser', '0', 0, '2022-05-12', '10:44:13', '2022-05-12', '10:44:13'); +INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (5, 'postBrowser', '0', 0, '2022-05-16', '11:01:31', '2022-05-16', '11:01:31'); +INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (6, 'compBrowser', '0', 0, '2022-05-24', '14:49:23', '2022-05-24', '14:49:23'); +INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (18, 'deptBrowser', '0', 0, '2022-05-31', '10:07:35', '2022-05-31', '10:07:35'); +INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (19, 'sequenceBrowser', '0', 0, '2022-05-31', '10:19:57', '2022-05-31', '10:19:57'); +INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (20, 'jobBrowser', '0', 0, '2022-05-31', '14:16:19', '2022-05-31', '14:16:19'); +INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (21, 'staffPlanBrowser', '0', 0, '2022-06-07', '09:57:42', '2022-06-07', '09:57:42'); +INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (22, 'deptBrowserPrepare', '0', 0, '2022-06-24', '16:15:59', '2022-06-24', '16:15:59'); +INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (23, 'gradeBrowser', '0', 0, '2022-07-07', '14:10:39', '2022-07-07', '14:10:39'); + + + +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (11, 7, '编号', 'scheme_no', '', 0, 1, '6ecae811d0f411eca80d0250f2000002', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (12, 7, '方案名称', 'scheme_name', '', 1, 2, '6ecec9f8d0f411eca80d0250f2000002', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (13, 7, '方案说明', 'scheme_description', '', 0, 3, '6f1143f3d0f411eca80d0250f2000002', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (197, 24, '编号', 'plan_no', '', 0, 1, '3809e856e60511ecb4aaf5a55dde45bb', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (198, 24, '名称', 'plan_name', '', 1, 2, '380ed1e0e60511ecb4aaf5a55dde45bb', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (199, 24, '年度', 'plan_year', '', 0, 3, '3812cb06e60511ecb4aaf5a55dde45bb', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (203, 9, '名称', 'post_name', '', 1, 1, 'd64afc56fb6511ec9a53e9994385d085', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (204, 9, '说明', 'description', '', 0, 2, 'd64c9868fb6511ec9a53e9994385d085', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (222, 22, '编号', 'sequence_no', '', 0, 1, '069c8186fc2411ec9a53e9994385d085', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (223, 22, '名称', 'sequence_name', '', 1, 2, '069d77b2fc2411ec9a53e9994385d085', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (224, 22, '等级方案', 'scheme_id', 'select scheme_name from jcl_org_scheme where id={?currentvalue}', 0, 3, '069e4034fc2411ec9a53e9994385d085', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (225, 22, '等级方案id', 'scheme_value', '', 0, 4, '069f1e82fc2411ec9a53e9994385d085', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (318, 8, '编号', 'level_no', '', 0, 1, 'ad54942e018c11edbe41ea108fa1766c', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (319, 8, '名称', 'level_name', '', 1, 2, 'ad5630ea018c11edbe41ea108fa1766c', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (320, 8, '描述说明', 'description', '', 0, 3, 'ad5766a4018c11edbe41ea108fa1766c', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (330, 26, '编号', 'grade_no', '', 0, 1, 'affb0dee01a911edbe41ea108fa1766c', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (331, 26, '名称', 'grade_name', '', 1, 2, 'affed2da01a911edbe41ea108fa1766c', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (332, 26, '描述方案', 'description', '', 0, 3, 'b000b80201a911edbe41ea108fa1766c', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (333, 26, '等级方案', 'scheme_id', 'select scheme_name from jcl_org_scheme where id={?currentvalue}', 0, 4, 'b0019d8001a911edbe41ea108fa1766c', NULL); +INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (334, 26, '职等', 'level_id', 'select group_concat(level_name) from jcl_org_level where id in ( {?currentvalue})', 0, 5, 'b002478001a911edbe41ea108fa1766c', NULL); diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 9f0e7172..b3cbd6e6 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -111,6 +111,7 @@ CREATE TABLE JCL_ORG_COMP ( delete_type int null, create_time date null, update_time date null, + uuid varchar(100) null, CONSTRAINT JCL_ORG_COMP_PK PRIMARY KEY (id) ); @@ -211,6 +212,7 @@ CREATE TABLE JCL_ORG_DEPT ( delete_type int null, create_time date null, update_time date null, + uuid varchar(100) null, CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (id) ); @@ -241,7 +243,9 @@ CREATE TABLE JCL_ORG_JOB ( job_no varchar(100) NULL, job_name varchar(100) NULL, parent_comp int null, + ec_company int null, parent_dept int null, + ec_department int null, sequence_id int null, scheme_id int null, parent_job int null, diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 57df152b..ee97c0d0 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -113,6 +113,7 @@ CREATE TABLE JCL_ORG_COMP ( DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, UPDATE_TIME DATE NULL, + UUID NVARCHAR2(100) NULL, CONSTRAINT JCL_ORG_COMP_PK PRIMARY KEY (ID) ); @@ -213,6 +214,7 @@ CREATE TABLE JCL_ORG_DEPT ( DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, UPDATE_TIME DATE NULL, + UUID NVARCHAR2(100) NULL, CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (ID) ); @@ -243,7 +245,9 @@ CREATE TABLE JCL_ORG_JOB ( JOB_NO NVARCHAR2(100) NULL, JOB_NAME NVARCHAR2(100) NULL, PARENT_COMP NUMBER NULL, + EC_COMPANY NUMBER NULL, PARENT_DEPT NUMBER NULL, + EC_DEPARTMENT NUMBER NULL, SEQUENCE_ID NUMBER NULL, SCHEME_ID NUMBER NULL, PARENT_JOB NUMBER NULL, diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index f791ae5b..0fbe147c 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -111,6 +111,7 @@ CREATE TABLE JCL_ORG_COMP ( delete_type int null, create_time datetime null, update_time datetime null, + uuid varchar(100) null, CONSTRAINT JCL_ORG_COMP_PK PRIMARY KEY (id) ); @@ -211,6 +212,7 @@ CREATE TABLE JCL_ORG_DEPT ( delete_type int null, create_time datetime null, update_time datetime null, + uuid varchar(100) null, CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (id) ); @@ -241,7 +243,9 @@ CREATE TABLE JCL_ORG_JOB ( job_no varchar(100) COLLATE Chinese_PRC_CI_AS NULL, job_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, parent_comp int null, + ec_company int null, parent_dept int null, + ec_department int null, sequence_id int null, scheme_id int null, parent_job int null, diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index 2b3fe819..713e54c2 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -1,71 +1,144 @@ package com.api.browser.service.impl; -import com.api.browser.bean.SplitTableBean; -import com.api.browser.bean.SplitTableColBean; +import com.alibaba.fastjson.JSON; +import com.api.browser.bean.SearchConditionItem; import com.api.browser.service.BrowserService; import com.api.browser.util.BrowserConstant; -import com.api.browser.util.BrowserDataType; -import com.api.browser.util.SplitTableUtil; +import com.api.hrm.bean.TreeNode; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.fieldset.vo.TypeTreeVO; -import com.engine.organization.entity.scheme.vo.SchemeTableVO; +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.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.google.common.collect.Lists; +import com.engine.organization.util.OrganizationFormItemUtil; +import com.engine.organization.util.db.DBType; +import org.apache.commons.lang.StringUtils; +import weaver.conn.RecordSet; import weaver.general.Util; -import weaver.hrm.User; -import weaver.hrm.city.CityComInfo; -import weaver.systeminfo.SystemEnv; - -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** - * @Author weaver_cl - * @Description: - * @Date 2022/7/13 - * @Version V1.0 - **/ + * @author:dxfeng + * @createTime: 2022/07/15 + * @version: 1.0 + */ public class JobBrowserService extends BrowserService { - @Override - public Map getBrowserData(Map params) throws Exception { + public Map getBrowserData(Map params) { Map resultMap = new HashMap<>(); - String datatype = Util.null2String(params.get("datatype")); - if("tree".equals(datatype)){ - - List> nodeData = new ArrayList<>(); - Map hashMap = new HashMap<>(); - hashMap.put("domid","comp_21"); - hashMap.put("hasChild",true); - hashMap.put("isLeaf",false); - hashMap.put("isopen",true); - hashMap.put("key","compsss_21"); - hashMap.put("name","成功"); - - nodeData.add(hashMap); - //resultMap.put(BrowserConstant.BROWSER_RESULT_TYPE, BrowserDataType.TREE_DATA.getTypeid()); - resultMap.put("datas", nodeData); - }else { - OrganizationWeaTable table = new OrganizationWeaTable<>(user, SchemeTableVO.class); + 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()); + } + } + List cusBrowserTrees = CusBowserTreeBO.convertSearchTreeToBorwserTree(nodeData); + resultMap.put("datas", cusBrowserTrees); + System.err.println(JSON.toJSONString(cusBrowserTrees)); + } else { + OrganizationWeaTable table = new OrganizationWeaTable<>(user, JobBrowserVO.class); + String sqlWhere = buildSqlWhere(params); + table.setSqlwhere(sqlWhere); WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); resultMap.putAll(result.getResultMap()); } + return resultMap; + } + @Override + public Map getBrowserConditionInfo(Map map) { + Map> apiDatas = new HashMap<>(); + List conditions = new ArrayList<>(); + // 编号 + SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "jobNo"); + // 名称 + SearchConditionItem jobNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "jobName"); + // 所属分部 + SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "ecCompany", ""); + // 所属部门 + SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "ecDepartment", ""); + + conditions.add(jobNoItem); + conditions.add(jobNameItem); + conditions.add(parentCompBrowserItem); + conditions.add(parentDeptBrowserItem); + apiDatas.put(BrowserConstant.BROWSER_RESULT_CONDITIONS, conditions); + return apiDatas; + } - - - - return resultMap; + /** + * 查询条件 + * + * @param params + * @return + */ + private String buildSqlWhere(Map params) { + DBType dbType = DBType.get(new RecordSet().getDBType()); + String sqlWhere = " where t.delete_type ='0' "; + String jobNo = Util.null2String(params.get("jobNo")); + if (StringUtils.isNotBlank(jobNo)) { + sqlWhere += " AND t.job_no " + dbType.like(jobNo); + } + String jobName = Util.null2String(params.get("jobName")); + if (StringUtils.isNotBlank(jobName)) { + sqlWhere += " AND t.job_name " + dbType.like(jobName); + } + String ecCompany = Util.null2String(params.get("ecCompany")); + if (StringUtils.isNotBlank(jobName)) { + sqlWhere += " AND t.ec_company = '" + Long.parseLong(ecCompany) + "'"; + } + String ecDepartment = Util.null2String(params.get("ecDepartment")); + if (StringUtils.isNotBlank(jobName)) { + sqlWhere += " AND t.ec_department = '" + Long.parseLong(ecDepartment) + "'"; + } + String treeKey = Util.null2String(params.get("treeKey")); + if (StringUtils.isNotBlank(treeKey)) { + String[] keyArray = treeKey.split("_"); + if (keyArray.length == 2) { + if (TreeNodeTypeEnum.TYPE_COMP.getName().equals(keyArray[0])) { + sqlWhere += " AND t.parent_comp = '" + Long.parseLong(keyArray[1]) + "'"; + } else if (TreeNodeTypeEnum.TYPE_DEPT.getName().equals(keyArray[0])) { + sqlWhere += " AND t.parent_dept = '" + Long.parseLong(keyArray[1]) + "'"; + } + } + } + return sqlWhere; } } diff --git a/src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java b/src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java new file mode 100644 index 00000000..f641a4be --- /dev/null +++ b/src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java @@ -0,0 +1,45 @@ +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; + +/** + * @author:dxfeng + * @createTime: 2022/07/15 + * @version: 1.0 + */ +public class CusBowserTreeBO { + + /** + * 树转换 + * + * @param searchTree + * @return + */ + public static List convertSearchTreeToBorwserTree(List searchTree) { + List collect = searchTree.stream().map(item -> + CusBrowserTree.builder() + .domid("sel_" + item.getId()) + .hasChild(CollectionUtils.isNotEmpty(item.getSubs())) + .isLeaf(CollectionUtils.isEmpty(item.getSubs())) + .isopen(false) + .key(getKey(item)) + .name(item.getName()) + .build()).collect(Collectors.toList()); + return collect; + } + + private static String getKey(TreeNode treeNode) { + if (TreeNodeTypeEnum.TYPE_COMP.getValue().equals(treeNode.getType())) { + return TreeNodeTypeEnum.TYPE_COMP.getName() + "_" + treeNode.getId(); + } else if (TreeNodeTypeEnum.TYPE_DEPT.getValue().equals(treeNode.getType())) { + return TreeNodeTypeEnum.TYPE_DEPT.getName() + "_" + treeNode.getId(); + } + return treeNode.getId(); + } +} diff --git a/src/com/engine/organization/entity/browser/enums/TreeNodeTypeEnum.java b/src/com/engine/organization/entity/browser/enums/TreeNodeTypeEnum.java new file mode 100644 index 00000000..7e841c75 --- /dev/null +++ b/src/com/engine/organization/entity/browser/enums/TreeNodeTypeEnum.java @@ -0,0 +1,36 @@ +package com.engine.organization.entity.browser.enums; + +/** + * @author:dxfeng + * @createTime: 2022/07/15 + * @version: 1.0 + */ +public enum TreeNodeTypeEnum { + TYPE_COMP("company", "1"), + TYPE_DEPT("department", "2"); + + + private String name; + private String value; + + TreeNodeTypeEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/src/com/engine/organization/entity/browser/po/CusBrowserTree.java b/src/com/engine/organization/entity/browser/po/CusBrowserTree.java new file mode 100644 index 00000000..78c1e84b --- /dev/null +++ b/src/com/engine/organization/entity/browser/po/CusBrowserTree.java @@ -0,0 +1,32 @@ +package com.engine.organization.entity.browser.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/07/15 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class CusBrowserTree { + private String domid; + private boolean hasChild; + private boolean isLeaf; + private boolean isopen; + private String key; + private String name; + + public boolean getIsLeaf() { + return isLeaf; + } + + public void setIsLeaf(boolean leaf) { + isLeaf = leaf; + } +} diff --git a/src/com/engine/organization/entity/browser/po/CustomBrowserBean.java b/src/com/engine/organization/entity/browser/po/CustomBrowserBean.java new file mode 100644 index 00000000..7885d1de --- /dev/null +++ b/src/com/engine/organization/entity/browser/po/CustomBrowserBean.java @@ -0,0 +1,28 @@ +package com.engine.organization.entity.browser.po; + +import com.api.browser.bean.BrowserBean; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +/** + * @author:dxfeng + * @createTime: 2022/07/14 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class CustomBrowserBean extends BrowserBean { + + + private String leftToSearchKey; + private boolean hasLeftTree; + private Map leftTreeParams; + private String leftTreeUrl; + private boolean resize; +} diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 6fb569c6..1e389522 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -19,6 +19,7 @@ import com.engine.organization.entity.extend.param.ExtendInfoFieldParam; import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; import com.engine.organization.mapper.extend.ExtendInfoMapper; +import com.engine.organization.entity.browser.po.CustomBrowserBean; import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.sensitive.biz.SensitiveWordTypeComInfo; @@ -71,11 +72,11 @@ public class ExtendInfoBO { /** * 新增自定义字段时，对象转换 * - * @param user 当前用户 + * @param user 当前用户 * @param infoFieldParam 拓展字段 - * @param extendGroupPO 分组实体 - * @param extendGroupId 分组ID - * @param showOrder 展示顺序 + * @param extendGroupPO 分组实体 + * @param extendGroupId 分组ID + * @param showOrder 展示顺序 */ public static ExtendInfoPO convertFieldParam2ExtendInfo(User user, ExtendInfoFieldParam infoFieldParam, ExtendGroupPO extendGroupPO, Long extendGroupId, Integer showOrder) { if (null == infoFieldParam) { @@ -335,6 +336,15 @@ public class ExtendInfoBO { } else { searchConditionItem = conditionFactory.createCondition(ConditionType.BROWSER, fieldlabel, fieldname, detailtype); } + // 岗位浏览按钮 + if ("666".equals(detailtype)) { + BrowserBean browserBean = searchConditionItem.getBrowserConditionParam(); + String s = JSONObject.toJSONString(browserBean); + CustomBrowserBean customBrowserBean = JSONObject.parseObject(s, CustomBrowserBean.class); + customBrowserBean.setHasLeftTree(true); + customBrowserBean.setLeftToSearchKey("treeKey"); + searchConditionItem.setBrowserConditionParam(customBrowserBean); + } List> replaceDatas = new ArrayList<>(); String tmpFieldValue = Util.null2String(fieldvalue); switch (detailtype) { diff --git a/src/com/engine/organization/entity/job/bo/JobBO.java b/src/com/engine/organization/entity/job/bo/JobBO.java index 9e9d294c..ee51624a 100644 --- a/src/com/engine/organization/entity/job/bo/JobBO.java +++ b/src/com/engine/organization/entity/job/bo/JobBO.java @@ -1,5 +1,7 @@ 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; @@ -8,7 +10,9 @@ 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; import java.util.*; import java.util.stream.Collectors; @@ -25,13 +29,17 @@ 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()) .jobNo(param.getJobNo()) .jobName(param.getJobName()) - .parentComp(null == param.getParentComp() ? param.getSubcompanyid1() : param.getParentComp()) - .parentDept(null == param.getParentDept() ? param.getDepartmentid() : param.getParentDept()) + .ecCompany(null == param.getEcCompany() ? param.getSubcompanyid1() : param.getEcCompany()) + .ecDepartment(null == param.getEcDepartment() ? param.getDepartmentid() : param.getEcDepartment()) + .parentComp(null == jclCompany ? null : jclCompany.getId()) + .parentDept(null == jclDepartment ? null : jclDepartment.getId()) .sequenceId(param.getSequenceId()) .schemeId(param.getSchemeId()) .parentJob(param.getParentJob()) diff --git a/src/com/engine/organization/entity/job/param/JobSearchParam.java b/src/com/engine/organization/entity/job/param/JobSearchParam.java index 2d7cc07a..9989867d 100644 --- a/src/com/engine/organization/entity/job/param/JobSearchParam.java +++ b/src/com/engine/organization/entity/job/param/JobSearchParam.java @@ -30,13 +30,13 @@ public class JobSearchParam extends BaseQueryParam { */ private String jobName; /** - * 所属分部 + * ec分部 */ - private Long parentComp; + private Long ecCompany; /** - * 所属部门 + * ec部门 */ - private Long parentDept; + private Long ecDepartment; /** * 岗位序列 */ diff --git a/src/com/engine/organization/entity/job/po/JobPO.java b/src/com/engine/organization/entity/job/po/JobPO.java index 79be008f..d635e321 100644 --- a/src/com/engine/organization/entity/job/po/JobPO.java +++ b/src/com/engine/organization/entity/job/po/JobPO.java @@ -34,10 +34,20 @@ public class JobPO { * 所属分部 */ private Long parentComp; + + /** + * ec分部 + */ + private Long ecCompany; /** * 所属部门 */ private Long parentDept; + /** + * ec部门 + */ + private Long ecDepartment; + /** * 岗位序列 */ diff --git a/src/com/engine/organization/entity/job/vo/JobBrowserVO.java b/src/com/engine/organization/entity/job/vo/JobBrowserVO.java new file mode 100644 index 00000000..68db9c0b --- /dev/null +++ b/src/com/engine/organization/entity/job/vo/JobBrowserVO.java @@ -0,0 +1,45 @@ +package com.engine.organization.entity.job.vo; + +import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.organization.annotation.OrganizationTable; +import com.engine.organization.annotation.OrganizationTableColumn; +import com.engine.organization.annotation.OrganizationTableOperate; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/07/15 + * @version: 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@OrganizationTable(pageId = "98e9c62f-cd12-11ec-a15f-00ffcbed7123", + fields = "t.id," + + "t.job_no," + + "t.job_name as name ", + fromSql = "FROM jcl_org_job t ", + orderby = "job_no", + sortway = "asc", + primarykey = "id", + operates = { + @OrganizationTableOperate(index = "0", text = "编辑"), + @OrganizationTableOperate(index = "1", text = "删除") + }, + tableType = WeaTableType.CHECKBOX +) +public class JobBrowserVO { + + @OrganizationTableColumn(column = "id", display = false) + private Long id; + + @OrganizationTableColumn(text = "编号", width = "25%", column = "job_no") + private String jobNo; + + @OrganizationTableColumn(text = "方案名称", width = "25%", column = "name") + private String jobName; +} diff --git a/src/com/engine/organization/mapper/comp/CompMapper.java b/src/com/engine/organization/mapper/comp/CompMapper.java index ff119d78..755dd9df 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.java +++ b/src/com/engine/organization/mapper/comp/CompMapper.java @@ -77,6 +77,14 @@ public interface CompMapper { */ CompPO listById(@Param("id") long id); + /** + * 根据UUID查询数据 + * + * @param uuid + * @return + */ + CompPO getCompanyByUUID(@Param("uuid") String uuid); + /** * 根据No查询数据 diff --git a/src/com/engine/organization/mapper/comp/CompMapper.xml b/src/com/engine/organization/mapper/comp/CompMapper.xml index 77a1aad8..9bf6e072 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.xml +++ b/src/com/engine/organization/mapper/comp/CompMapper.xml @@ -292,6 +292,14 @@ from JCL_ORG_STAFFPLAN where delete_type = 0 + update jcl_org_comp diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.java b/src/com/engine/organization/mapper/department/DepartmentMapper.java index 6b4c470c..f30e2787 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.java +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.java @@ -62,6 +62,14 @@ public interface DepartmentMapper { */ DepartmentPO getDeptById(@Param("id") long id); + /** + * 根据UUID查询数据 + * + * @param uuid + * @return + */ + DepartmentPO getDepartmentByUUID(@Param("uuid") String uuid); + /** * 根据ID查询名称 * @@ -117,6 +125,7 @@ public interface DepartmentMapper { /** * 根据名称、上级 查询部门元素 + * * @param departmentName * @param parentCompany * @param parentDepartment diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index fe32a135..126ef797 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -150,6 +150,13 @@ and parent_comp = #{parentCompany} + and ifnull(parent_dept,0) = #{parentDepartment} diff --git a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java index 1dbc9ddd..6e6e0e54 100644 --- a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java +++ b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java @@ -4,6 +4,7 @@ package com.engine.organization.mapper.hrmresource; import com.alibaba.fastjson.JSONObject; import org.apache.ibatis.annotations.Param; +import java.util.Collection; import java.util.List; /** @@ -35,5 +36,17 @@ public interface SystemDataMapper { JSONObject getHrmObjectByUUID(@Param("tableName") String tableName, @Param("uuid") String uuid); + JSONObject getHrmJobTitleByName(@Param("name") String name); + + List getHrmResourceIds(@Param("departmentId") Long departmentId, @Param("jobTitle") String jobTitle); + + /** + * 更新人员岗位 + * + * @param jobTitle + * @param ids + * @return + */ + int updateResourceJobTitleByIds(@Param("jobTitle") String jobTitle, @Param("ids") Collection ids); } diff --git a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml index 2551abe9..4af54879 100644 --- a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml +++ b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml @@ -1,6 +1,12 @@ + + update hrmresource set JOBTITLE = #{jobTitle} where id in + + #{id} + + + + + \ 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 7a93dad0..1017d4ec 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -79,6 +79,15 @@ public interface JobMapper { */ List listByNo(@Param("jobNo") String jobNo); + /** + * 查询是否存在同名岗位 + * + * @param jobName + * @param id + * @return + */ + List listByNameExceptId(@Param("jobName") String jobName, @Param("id") Long id); + /** * 根据所属部门查询数据 * diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 5ed38b6e..1d62d7eb 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -355,6 +355,14 @@ #{id} + and ifnull(parent_job,0) = diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 05f583d0..bdc2fea5 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -25,20 +25,24 @@ import com.engine.organization.entity.job.param.JobSearchParam; import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; +import com.engine.organization.enums.LogModuleNameEnum; +import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.mapper.codesetting.CodeRuleMapper; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtendTitleMapper; -import com.engine.organization.mapper.job.JobDTMapper; +import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.ExtService; import com.engine.organization.service.JobService; +import com.engine.organization.thread.OrganizationRunable; import com.engine.organization.util.*; import com.engine.organization.util.coderule.CodeRuleUtil; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageInfo; import com.engine.organization.util.page.PageUtil; +import com.engine.organization.util.relation.EcHrmRelationUtil; import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -89,6 +93,8 @@ public class JobServiceImpl extends Service implements JobService { private static final String RIGHT_NAME = "Job:All"; + private static final String JOB_ACTIVITY_ID; + /** * 岗位主表title指定ID */ @@ -98,10 +104,6 @@ public class JobServiceImpl extends Service implements JobService { return MapperProxyFactory.getProxy(JobMapper.class); } - private JobDTMapper getJobDTMapper() { - return MapperProxyFactory.getProxy(JobDTMapper.class); - } - private CompMapper getCompMapper() { return MapperProxyFactory.getProxy(CompMapper.class); } @@ -119,6 +121,11 @@ public class JobServiceImpl extends Service implements JobService { } + static { + JSONObject hrmJobActivity = MapperProxyFactory.getProxy(SystemDataMapper.class).getHrmObjectByUUID("hrmjobactivities", "3a2efce3-95de-4ec2-afe1-347783817bdb"); + JOB_ACTIVITY_ID = hrmJobActivity.getString("ID"); + } + @Override public Map getSearchTree(SearchTreeParams params) { String keyword = params.getKeyword(); @@ -191,9 +198,9 @@ public class JobServiceImpl extends Service implements JobService { // 名称 SearchConditionItem jobNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "jobName"); // 所属分部 - SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "161", "parentComp", "compBrowser"); + SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "ecCompany", ""); // 所属部门 - SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "161", "parentDept", "deptBrowser"); + SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "ecDepartment", ""); // 岗位序列 SearchConditionItem sequenceBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位序列", "161", "sequenceId", "sequenceBrowser"); // 等级方案 @@ -305,14 +312,23 @@ public class JobServiceImpl extends Service implements JobService { JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class); params.put("is_key", null == searchParam.getIsKey() ? 0 : searchParam.getIsKey()); - // TODO 处理ec表关联关系 - //DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept()); - //params.put("parent_comp", departmentPO.getParentComp()); + Long ecDepartment = searchParam.getEcDepartment(); + DepartmentPO jclDepartment = EcHrmRelationUtil.getJclDepartmentId(ecDepartment + ""); + params.put("parent_dept", jclDepartment.getId()); + params.put("parent_comp", jclDepartment.getParentComp()); + if (null != jclDepartment.getParentComp()) { + params.put("ec_company", EcHrmRelationUtil.getEcCompanyId(jclDepartment.getParentComp() + "")); + } + if (StringUtils.isBlank(params.get("show_order").toString())) { int maxShowOrder = getJobMapper().getMaxShowOrder(); params.put("show_order", maxShowOrder + 1); } - return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", null); + Long jobId = getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", null); + params.put("jobactivityid", JOB_ACTIVITY_ID); + params.put("id", jobId); + new Thread(new OrganizationRunable(user, LogModuleNameEnum.JOB, OperateTypeEnum.ADD, params)).start(); + return jobId; } @Override @@ -324,7 +340,8 @@ public class JobServiceImpl extends Service implements JobService { if ("0".equals(groupId)) { groupId = GROUP_ID.toString(); } - String oldJobNo = getJobMapper().getJobById(searchParam.getId()).getJobNo(); + JobPO oldJobPO = getJobMapper().getJobById(searchParam.getId()); + String oldJobNo = oldJobPO.getJobNo(); String jobNo = searchParam.getJobNo(); if (!oldJobNo.equals(jobNo)) { jobNo = repeatDetermine(jobNo); @@ -333,9 +350,15 @@ public class JobServiceImpl extends Service implements JobService { // 更新主表数据 params.put("is_key", searchParam.getIsKey()); - // TODO 处理ec表关联关系 - //DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept()); - //params.put("parent_comp", departmentPO.getParentComp()); + Long ecDepartment = searchParam.getEcDepartment(); + DepartmentPO jclDepartment = EcHrmRelationUtil.getJclDepartmentId(ecDepartment + ""); + params.put("parent_dept", jclDepartment.getId()); + params.put("parent_comp", jclDepartment.getParentComp()); + if (null != jclDepartment.getParentComp()) { + params.put("ec_company", EcHrmRelationUtil.getEcCompanyId(jclDepartment.getParentComp() + "")); + } + params.put("jobactivityid", JOB_ACTIVITY_ID); + new Thread(new OrganizationRunable(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, params, oldJobPO)).start(); getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", searchParam.getId()); // 更新主表拓展表 getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOBEXT, params, groupId, searchParam.getId()); @@ -367,7 +390,8 @@ public class JobServiceImpl extends Service implements JobService { @Override public int updateForbiddenTagById(JobSearchParam params) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - JobPO jobPO = JobPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); + JobPO jobPO = JobPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).jobName(getJobMapper().getJobById(params.getId()).getJobName()).build(); + new Thread(new OrganizationRunable(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobPO)).start(); return getJobMapper().updateForbiddenTagById(jobPO.getId(), jobPO.getForbiddenTag()); } @@ -375,7 +399,12 @@ public class JobServiceImpl extends Service implements JobService { public int deleteByIds(Collection ids) { HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); - return getJobMapper().deleteByIds(ids); + List jobsByIds = getJobMapper().getJobsByIds(ids); + int delete = getJobMapper().deleteByIds(ids); + for (JobPO jobsById : jobsByIds) { + new Thread(new OrganizationRunable(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobsById)).start(); + } + return delete; } @Override @@ -420,7 +449,7 @@ public class JobServiceImpl extends Service implements JobService { JobPO mergeJob = getJobMapper().getJobById(mergeParam.getId()); mergeJob.setForbiddenTag(1); updateCount += getJobMapper().updateBaseJob(mergeJob); - + new Thread(new OrganizationRunable(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, mergeJob)).start(); //TODO 合并该刚岗位下的人员 // 合并后岗位及子岗位禁用 @@ -594,6 +623,7 @@ public class JobServiceImpl extends Service implements JobService { job.setParentJob(parentJob); job.setForbiddenTag(1); getJobMapper().updateBaseJob(job); + new Thread(new OrganizationRunable(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, job)).start(); List childJobs = getJobMapper().getJobsByPid(job.getId()); forbiddenChildTag(parentComp, parentDept, job.getId(), childJobs); } diff --git a/src/com/engine/organization/thread/OrganizationRunable.java b/src/com/engine/organization/thread/OrganizationRunable.java index de196d81..03b731b6 100644 --- a/src/com/engine/organization/thread/OrganizationRunable.java +++ b/src/com/engine/organization/thread/OrganizationRunable.java @@ -2,17 +2,18 @@ package com.engine.organization.thread; import com.alibaba.fastjson.JSONObject; import com.engine.common.util.ServiceUtil; +import com.engine.hrm.service.impl.HrmJobServiceImpl; import com.engine.hrm.service.impl.OrganizationServiceImpl; -import com.engine.organization.entity.company.po.CompPO; -import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.extend.param.ExtendInfoParams; +import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.enums.LogModuleNameEnum; import com.engine.organization.enums.OperateTypeEnum; -import com.engine.organization.mapper.comp.CompMapper; -import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; +import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.util.db.MapperProxyFactory; +import com.engine.organization.util.relation.EcHrmRelationUtil; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import weaver.general.Util; import weaver.hrm.User; @@ -21,6 +22,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author:dxfeng @@ -32,6 +34,7 @@ public class OrganizationRunable implements Runnable { private OperateTypeEnum operateType; private Map params; private User user; + private JobPO oldJobPO; private static final String HRM_COMPANY = "hrmsubcompany"; private static final String HRM_DEPARTMENT = "hrmdepartment"; @@ -47,22 +50,22 @@ public class OrganizationRunable implements Runnable { return MapperProxyFactory.getProxy(ExtMapper.class); } - private CompMapper getCompMapper() { - return MapperProxyFactory.getProxy(CompMapper.class); - } - - private DepartmentMapper getDepartmentMapper() { - return MapperProxyFactory.getProxy(DepartmentMapper.class); + public OrganizationRunable(User user, LogModuleNameEnum moduleName, OperateTypeEnum operateType, Map params) { + this.moduleName = moduleName; + this.operateType = operateType; + this.params = params; + this.user = user; } - - public OrganizationRunable(User user, LogModuleNameEnum moduleName, OperateTypeEnum operateType, Map params) { + public OrganizationRunable(User user, LogModuleNameEnum moduleName, OperateTypeEnum operateType, Map params, JobPO oldJobPO) { this.moduleName = moduleName; this.operateType = operateType; this.params = params; this.user = user; + this.oldJobPO = oldJobPO; } + @Override public void run() { switch (moduleName) { @@ -121,16 +124,157 @@ public class OrganizationRunable implements Runnable { private void refreshJob() { switch (operateType) { case ADD: + addJob(); break; case UPDATE: + updateJob(); break; - case DELETE: + case CANCELED: + cancelJob(); break; default: break; } } + /** + * 新增岗位 + * + *

+ * 1、EC表HrmJobTitles + *

+ * 2、系统中新建“聚才林”、“默认职务”（sql写入） + *

+ * 3、检索岗位名称jobtitlename，如果已存在，判断是否封存，对已封存数据解封操作 + *

+ * 4、如果不存在，在“聚才林--默认职务”下新建岗位 + */ + private void addJob() { + // 判断是否存在同名岗位、存在不做处理，不存在，在“默认职务分类--默认职务”下新建岗位 + String jobName = Util.null2String(params.get("job_name")); + JSONObject hrmJobActivity = getSystemDataMapper().getHrmJobTitleByName(jobName); + Map map = new HashMap<>(); + //存在且已封存，对岗位解封 + if (null != hrmJobActivity && "1".equals(hrmJobActivity.getString("canceled"))) { + map.put("ids", hrmJobActivity.getString("id")); + map.put("canceled", "docanceled"); + ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user); + } else { + // 不存在则新建职务 + map.put("operateIp", Util.null2String(user.getLoginip())); + map.put("jobtitlemark", jobName); + map.put("jobtitlename", jobName); + map.put("jobactivityid", Util.null2String(params.get("jobactivityid"))); + map.put("jobresponsibility", Util.null2String(params.get("work_duty"))); + map.put("jobcompetency", Util.null2String(params.get("work_authority"))); + map.put("jobtitleremark", Util.null2String(params.get("description"))); + map.put("jobtitlecode", Util.null2String(params.get("job_no"))); + + ServiceUtil.getService(HrmJobServiceImpl.class, user).addJobTitle(map, user); + } + } + + /** + * 更新岗位 + */ + private void updateJob() { + Long jclJobId = oldJobPO.getId(); + String oldName = oldJobPO.getJobName(); + + String newName = Util.null2String(params.get("job_name")); + JSONObject oldHrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(oldName); + + Map map = new HashMap<>(); + // 修改前不存在共用 + if (EcHrmRelationUtil.isNotExistJob(oldName, jclJobId)) { + // 修改后不存在共用、直接修改EC岗位表数据 + if (EcHrmRelationUtil.isNotExistJob(newName, jclJobId)) { + // 查询ec表ID + JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(oldName); + map.put("id", Util.null2String(hrmJobTitle.get("id"))); + map.put("operateIp", Util.null2String(user.getLoginip())); + map.put("jobtitlemark", newName); + map.put("jobtitlename", newName); + map.put("jobactivityid", Util.null2String(params.get("jobactivityid"))); + map.put("jobresponsibility", Util.null2String(params.get("work_duty"))); + map.put("jobcompetency", Util.null2String(params.get("work_authority"))); + map.put("jobtitleremark", Util.null2String(params.get("description"))); + map.put("jobtitlecode", Util.null2String(params.get("job_no"))); + // 修改岗位表数据 + ServiceUtil.getService(HrmJobServiceImpl.class, user).editJobTitle(map, user); + } else { + // 修改后存在共用、不修改岗位表数据，更新对应人员的岗位信息为当前岗位的ID + JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName); + // 查询原分部、原岗位下的人员，并更新岗位ID + List hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getString("id")); + getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.get("id")), hrmResourceIds); + // 封存原名称岗位 + map.clear(); + map.put("ids", oldHrmJobTitle.getString("id")); + map.put("canceled", "canceled"); + ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user); + } + } else { + // 修改前存在共用，不对原有数据进行操作。 + + // 修改后不存在共用、新建岗位，更新原有岗位下人员的岗位ID + if (EcHrmRelationUtil.isNotExistJob(newName, jclJobId)) { + // 不存在则新建职务 + map.put("operateIp", Util.null2String(user.getLoginip())); + map.put("jobtitlemark", newName); + map.put("jobtitlename", newName); + map.put("jobactivityid", Util.null2String(params.get("jobactivityid"))); + map.put("jobresponsibility", Util.null2String(params.get("work_duty"))); + map.put("jobcompetency", Util.null2String(params.get("work_authority"))); + map.put("jobtitleremark", Util.null2String(params.get("description"))); + map.put("jobtitlecode", Util.null2String(params.get("job_no"))); + ServiceUtil.getService(HrmJobServiceImpl.class, user).addJobTitle(map, user); + // 新建岗位 + JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName); + // 查询原分部、原岗位下的人员，并更新岗位ID + List hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getString("id")); + getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.get("id")), hrmResourceIds); + } else { + // 修改后存在共用，更新原有岗位下人员的岗位ID + JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName); + // 查询原分部、原岗位下的人员，并更新岗位ID + List hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getString("id")); + getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.get("id")), hrmResourceIds); + } + } + } + + /** + * 封存、解封岗位 + */ + private void cancelJob() { + Map map = new HashMap<>(); + JSONObject hrmJobTitleByName = getSystemDataMapper().getHrmJobTitleByName(oldJobPO.getJobName()); + if (0 == oldJobPO.getForbiddenTag()) { + // 启用 + map.put("ids", hrmJobTitleByName.getString("id")); + map.put("canceled", "docanceled"); + ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user); + } else { + // 禁用 + List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listByNameExceptId(oldJobPO.getJobName(), oldJobPO.getId()); + // 不存在共用 + if (CollectionUtils.isEmpty(jobPOS)) { + map.put("ids", hrmJobTitleByName.getString("id")); + map.put("canceled", "canceled"); + ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user); + } else { + List collect = jobPOS.stream().filter(item -> 0 == item.getForbiddenTag()).collect(Collectors.toList()); + // 不存在非禁用 + if (CollectionUtils.isEmpty(collect)) { + map.put("ids", hrmJobTitleByName.getString("id")); + map.put("canceled", "canceled"); + ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user); + } + } + } + } + /** * 新增部门 */ @@ -142,13 +286,13 @@ public class OrganizationRunable implements Runnable { // 上级分部通过UUID联查ec表ID String parentCompany = Util.null2String(params.get("parent_comp")); if (StringUtils.isNotBlank(parentCompany)) { - map.put("subcompanyid1", getEcCompanyId(parentCompany)); + map.put("subcompanyid1", EcHrmRelationUtil.getEcCompanyId(parentCompany)); } // 上级部门通过UUID联查ec表ID String parentDepartment = Util.null2String(params.get("parent_dept")); if (StringUtils.isNotBlank(parentDepartment)) { - map.put("supdepid", getEcDepartmentId(parentDepartment)); + map.put("supdepid", EcHrmRelationUtil.getEcDepartmentId(parentDepartment)); } map.put("showorder", Util.null2String(params.get("show_order"))); @@ -170,7 +314,7 @@ public class OrganizationRunable implements Runnable { List idList = new ArrayList<>(); String[] split = departmentIds.split(","); for (String s : split) { - idList.add(getEcDepartmentId(s)); + idList.add(EcHrmRelationUtil.getEcDepartmentId(s)); } Map map = new HashMap<>(); map.put("id", StringUtils.join(idList, ",")); @@ -189,20 +333,20 @@ public class OrganizationRunable implements Runnable { private void updateDepartment() { Map map = new HashMap<>(); // 获取ec表ID - map.put("id", getEcDepartmentId(Util.null2String(params.get("id")))); + map.put("id", EcHrmRelationUtil.getEcDepartmentId(Util.null2String(params.get("id")))); map.put("departmentmark", Util.null2String(params.get("dept_name_short"))); map.put("departmentname", Util.null2String(params.get("dept_name"))); // 上级分部通过UUID联查ec表ID String parentCompany = Util.null2String(params.get("parent_comp")); if (StringUtils.isNotBlank(parentCompany)) { - map.put("subcompanyid1", getEcCompanyId(parentCompany)); + map.put("subcompanyid1", EcHrmRelationUtil.getEcCompanyId(parentCompany)); } // 上级部门通过UUID联查ec表ID String parentDepartment = Util.null2String(params.get("parent_dept")); if (StringUtils.isNotBlank(parentDepartment)) { - map.put("supdepid", getEcDepartmentId(parentDepartment)); + map.put("supdepid", EcHrmRelationUtil.getEcDepartmentId(parentDepartment)); } map.put("showorder", Util.null2String(params.get("show_order"))); @@ -221,7 +365,7 @@ public class OrganizationRunable implements Runnable { // 上级分部通过UUID联查ec表ID String parentCompany = Util.null2String(params.get("parent_company")); if (StringUtils.isNotBlank(parentCompany)) { - map.put("supsubcomid", getEcCompanyId(parentCompany)); + map.put("supsubcomid", EcHrmRelationUtil.getEcCompanyId(parentCompany)); } map.put("subcompanycode", params.get("comp_no").toString()); @@ -241,12 +385,12 @@ public class OrganizationRunable implements Runnable { private void updateCompany() { Map map = new HashMap<>(); // 获取ec表ID - map.put("id", getEcCompanyId(Util.null2String(params.get("id")))); + map.put("id", EcHrmRelationUtil.getEcCompanyId(Util.null2String(params.get("id")))); // 上级分部通过UUID联查ec表ID String parentCompany = Util.null2String(params.get("parent_company")); if (StringUtils.isNotBlank(parentCompany)) { - map.put("supsubcomid", getEcCompanyId(parentCompany)); + map.put("supsubcomid", EcHrmRelationUtil.getEcCompanyId(parentCompany)); } map.put("subcompanycode", Util.null2String(params.get("comp_no"))); map.put("subcompanyname", Util.null2String(params.get("comp_name_short"))); @@ -264,7 +408,7 @@ public class OrganizationRunable implements Runnable { List idList = new ArrayList<>(); String[] split = companyIds.split(","); for (String s : split) { - idList.add(getEcCompanyId(s)); + idList.add(EcHrmRelationUtil.getEcCompanyId(s)); } Map map = new HashMap<>(); map.put("id", StringUtils.join(idList, ",")); @@ -290,32 +434,9 @@ public class OrganizationRunable implements Runnable { String uuid = hrmDepartment.getString("uuid"); Map departmentMap = new HashMap<>(); departmentMap.put("uuid", uuid); - long departmentId = Long.parseLong(Util.null2String(params.get("id"))); - ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName(jclTableName).params(departmentMap).id(departmentId).build(); + long jclTableId = Long.parseLong(Util.null2String(params.get("id"))); + ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName(jclTableName).params(departmentMap).id(jclTableId).build(); getExtMapper().updateExt(infoParams); } - /** - * 根据jcl_org_comp.id获取HrmSubCompany.id - * - * @param companyId - * @return - */ - private String getEcCompanyId(String companyId) { - CompPO compPO = getCompMapper().listById(Long.parseLong(companyId)); - JSONObject supSubCompany = getSystemDataMapper().getHrmObjectByUUID(HRM_COMPANY, compPO.getUuid()); - return supSubCompany.getString("id"); - } - - /** - * 根据jcl_org_dept.id获取HrmDepartment.id - * - * @param departmentId - * @return - */ - private String getEcDepartmentId(String departmentId) { - DepartmentPO departmentPO = getDepartmentMapper().getDeptById(Long.parseLong(departmentId)); - JSONObject supDepartment = getSystemDataMapper().getHrmObjectByUUID(HRM_DEPARTMENT, departmentPO.getUuid()); - return supDepartment.getString("id"); - } } diff --git a/src/com/engine/organization/util/relation/EcHrmRelationUtil.java b/src/com/engine/organization/util/relation/EcHrmRelationUtil.java new file mode 100644 index 00000000..97f066e2 --- /dev/null +++ b/src/com/engine/organization/util/relation/EcHrmRelationUtil.java @@ -0,0 +1,119 @@ +package com.engine.organization.util.relation; + +import com.alibaba.fastjson.JSONObject; +import com.engine.organization.entity.company.po.CompPO; +import com.engine.organization.entity.department.po.DepartmentPO; +import com.engine.organization.entity.job.po.JobPO; +import com.engine.organization.mapper.comp.CompMapper; +import com.engine.organization.mapper.department.DepartmentMapper; +import com.engine.organization.mapper.hrmresource.SystemDataMapper; +import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.util.db.MapperProxyFactory; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; + +import java.util.List; + +/** + * @author:dxfeng + * @createTime: 2022/07/13 + * @version: 1.0 + */ +public class EcHrmRelationUtil { + + private static final String HRM_COMPANY = "hrmsubcompany"; + private static final String HRM_DEPARTMENT = "hrmdepartment"; + + + private static SystemDataMapper getSystemDataMapper() { + return MapperProxyFactory.getProxy(SystemDataMapper.class); + } + + private static CompMapper getCompMapper() { + return MapperProxyFactory.getProxy(CompMapper.class); + } + + private static DepartmentMapper getDepartmentMapper() { + return MapperProxyFactory.getProxy(DepartmentMapper.class); + } + + private static JobMapper getJobMapper() { + return MapperProxyFactory.getProxy(JobMapper.class); + } + + /** + * 根据jcl_org_comp.id获取HrmSubCompany.id + * + * @param companyId + * @return + */ + public static String getEcCompanyId(String companyId) { + CompPO compPO = getCompMapper().listById(Long.parseLong(companyId)); + JSONObject supSubCompany = getSystemDataMapper().getHrmObjectByUUID(HRM_COMPANY, compPO.getUuid()); + return supSubCompany.getString("id"); + } + + /** + * 根据jcl_org_dept.id获取HrmDepartment.id + * + * @param departmentId + * @return + */ + public static String getEcDepartmentId(String departmentId) { + DepartmentPO departmentPO = getDepartmentMapper().getDeptById(Long.parseLong(departmentId)); + JSONObject supDepartment = getSystemDataMapper().getHrmObjectByUUID(HRM_DEPARTMENT, departmentPO.getUuid()); + return supDepartment.getString("id"); + } + + public static CompPO getJclCompanyId(String ecCompanyId) { + if (StringUtils.isBlank(ecCompanyId)) { + return null; + } + JSONObject ecCompany = getSystemDataMapper().getHrmObjectByID(HRM_COMPANY, ecCompanyId); + if (null == ecCompany) { + return null; + } + String uuid = ecCompany.getString("uuid"); + return getCompMapper().getCompanyByUUID(uuid); + } + + + public static DepartmentPO getJclDepartmentId(String ecDepartmentId) { + if (StringUtils.isBlank(ecDepartmentId)) { + return null; + } + JSONObject ecDepartment = getSystemDataMapper().getHrmObjectByID(HRM_DEPARTMENT, ecDepartmentId); + if (null == ecDepartment) { + return null; + } + String uuid = ecDepartment.getString("uuid"); + return getDepartmentMapper().getDepartmentByUUID(uuid); + } + + + /** + * 判断岗位名称是否共用 + *

存在返回true

+ * + * @param jobName + * @param id + * @return + */ + public static boolean isExistJob(String jobName, Long id) { + List jobPOS = getJobMapper().listByNameExceptId(jobName, id); + return CollectionUtils.isNotEmpty(jobPOS); + } + + /** + * 判断岗位名称是否共用 + *

不存在返回true

+ * + * @param jobName + * @param id + * @return + */ + public static boolean isNotExistJob(String jobName, Long id) { + return !isExistJob(jobName, id); + } + +}