From 96ba954aa136bc86a6358519a69d264e73965c8a Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 20 Jun 2022 09:56:21 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20=E5=88=9D=E5=A7=8B=E6=95=B0=E6=8D=AESQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/初始数据SQL/jcl_field_extendgroup.sql | 12 +++ docs/初始数据SQL/jcl_field_extendinfo.sql | 93 ++++++++++++++++++++++ docs/初始数据SQL/jcl_field_extendtitle.sql | 12 +++ docs/表结构SQL/MySQL.sql | 4 + docs/表结构SQL/Oracle.sql | 4 + docs/表结构SQL/SqlServer.sql | 4 + 6 files changed, 129 insertions(+) create mode 100644 docs/初始数据SQL/jcl_field_extendgroup.sql create mode 100644 docs/初始数据SQL/jcl_field_extendinfo.sql create mode 100644 docs/初始数据SQL/jcl_field_extendtitle.sql diff --git a/docs/初始数据SQL/jcl_field_extendgroup.sql b/docs/初始数据SQL/jcl_field_extendgroup.sql new file mode 100644 index 00000000..9f9f9bb8 --- /dev/null +++ b/docs/初始数据SQL/jcl_field_extendgroup.sql @@ -0,0 +1,12 @@ +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(1, 1, '基本信息', 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(2, 2, '基本信息', 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(3, 3, '基本信息', 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(4, 4, '基本信息', 1, 0, '2022-06-17', '2022-06-17', NULL, '1', 1, 0); diff --git a/docs/初始数据SQL/jcl_field_extendinfo.sql b/docs/初始数据SQL/jcl_field_extendinfo.sql new file mode 100644 index 00000000..2a2e56a7 --- /dev/null +++ b/docs/初始数据SQL/jcl_field_extendinfo.sql @@ -0,0 +1,93 @@ +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); +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); diff --git a/docs/初始数据SQL/jcl_field_extendtitle.sql b/docs/初始数据SQL/jcl_field_extendtitle.sql new file mode 100644 index 00000000..41d57f77 --- /dev/null +++ b/docs/初始数据SQL/jcl_field_extendtitle.sql @@ -0,0 +1,12 @@ +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); +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); +INSERT INTO jcl_field_extendtitle +(id, group_id, title, creator, delete_type, create_time, update_time, show_order, is_show, is_system_default) +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); diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 3bc3bbe4..5933b48d 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -120,6 +120,8 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP ( extend_type int null, group_name varchar(100) NULL, show_order int null, + is_show varchar(100) NULL, + is_system_default int null, creator int null, delete_type int null, create_time date null, @@ -134,6 +136,7 @@ create table JCL_FIELD_EXTENDTITLE ( title varchar(100) null, show_order int null, is_show int null, + is_system_default int null, creator int null, delete_type int null, create_time date null, @@ -161,6 +164,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( add_show int null, browser_show int null, show_order int null, + is_system_default int null, creator int null, delete_type int null, create_time date null, diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index ebc68141..1be6474e 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -122,6 +122,8 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP ( EXTEND_TYPE NUMBER NULL, GROUP_NAME NVARCHAR2(100) NULL, SHOW_ORDER NUMBER null, + IS_SHOW NVARCHAR2(100) NULL, + IS_SYSTEM_DEFAULT NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -136,6 +138,7 @@ CREATE TABLE JCL_FIELD_EXTENDTITLE ( TITLE VARCHAR(100) NULL, SHOW_ORDER NUMBER NULL, IS_SHOW NUMBER NULL, + IS_SYSTEM_DEFAULT NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -163,6 +166,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( ADD_SHOW NUMBER NULL, BROWSER_SHOW NUMBER NULL, SHOW_ORDER NUMBER NULL, + IS_SYSTEM_DEFAULT NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index d6c4d2b6..72eca184 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -120,6 +120,8 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP ( extend_type int null, group_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, show_order int null, + is_show varchar(100) COLLATE Chinese_PRC_CI_AS NULL, + is_system_default int null, creator int null, delete_type int null, create_time datetime null, @@ -134,6 +136,7 @@ create table JCL_FIELD_EXTENDTITLE ( title varchar(100) COLLATE Chinese_PRC_CI_AS NULL, show_order int null, is_show int null, + is_system_default int null, creator int null, delete_type int null, create_time date null, @@ -161,6 +164,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( add_show int null, browser_show int null, show_order int null, + is_system_default int null, creator int null, delete_type int null, create_time datetime null, From 835373a3d30d6eccc266c0a391aa8808b094ef54 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 20 Jun 2022 13:56:39 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 32 ++++++++++++++++++++++++++++++++ docs/表结构SQL/SqlServer.sql | 4 ++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 5933b48d..cf55e226 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -349,4 +349,36 @@ CREATE TABLE JCL_ORG_STAFFS ( create_time date null, update_time date null, CONSTRAINT JCL_ORG_STAFFS_PK PRIMARY KEY (id) +); + +-- JCL_ORG_MAP +CREATE TABLE JCL_ORG_MAP ( + id int auto_increment NOT NULL, + ftype int NULL, + fobjid int NULL, + fecid int NULL, + Uuid varchar(100) NULL, + fclass int NULL, + fclassname varchar(100) NULL, + fnumber varchar(100) NULL, + fname varchar(255) NULL, + fleader int NULL, + fleaderimg int NULL, + fleadername varchar(100) NULL, + fleaderjobid int NULL, + fleaderjob varchar(255) NULL, + fleaderlv varchar(100) NULL, + fleaderst varchar(100) NULL, + fparentid int null, + fobjparentid int null, + fplan int null, + fonjob int null, + fisvitual int null, + fdatebegin date null, + fdateend date null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_ORG_MAP PRIMARY KEY (id) ); \ No newline at end of file diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index 72eca184..c15b57bc 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -139,8 +139,8 @@ create table JCL_FIELD_EXTENDTITLE ( is_system_default int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_FIELD_EXTENDTITLE_PK PRIMARY KEY (id) ); From abf99aaa51f5d21b6cb0292772dbdcea30744ab8 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 20 Jun 2022 14:50:59 +0800 Subject: [PATCH 03/27] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/entity/extend/bo/ExtendGroupBO.java | 3 +++ .../engine/organization/entity/extend/bo/ExtendInfoBO.java | 2 +- .../engine/organization/mapper/extend/ExtendInfoMapper.xml | 1 - .../engine/organization/service/impl/ExtServiceImpl.java | 6 +++++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java index 76614a44..9848dd8b 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java @@ -74,6 +74,9 @@ public class ExtendGroupBO { case 3: tableName = "JCL_ORG_JOB"; break; + case 4: + tableName = "JCL_ORG_HRMRESOURCE"; + break; default: break; } diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 0adfead5..d3ad4d45 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -174,7 +174,7 @@ public class ExtendInfoBO { // 必填 if (1 == extendInfoPO.getIsrequired()) { fieldItem.setViewAttr(3); - fieldItem.setRules("required|string"); + fieldItem.setRules("required"); } else { fieldItem.setViewAttr(2); } diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index 725c17ac..eddb6dca 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -269,7 +269,6 @@ + listNoFilter(); + /** + * 根据搜索条件查询数据 + * @param jobPO + * @return + */ + List listPOsByFilter(JobPO jobPO); + /** * 查询所有数据 * diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 5e8ce87a..7fc6e50c 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -295,6 +295,31 @@ from jcl_org_job t where delete_type = 0 + diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java new file mode 100644 index 00000000..4440c006 --- /dev/null +++ b/src/com/engine/organization/service/HrmResourceService.java @@ -0,0 +1,21 @@ +package com.engine.organization.service; + +import com.engine.organization.entity.searchtree.SearchTreeParams; + +import java.util.Map; + +/** + * @author:dxfeng + * @createTime: 2022/06/20 + * @version: 1.0 + */ +public interface HrmResourceService { + + /** + * 列表左侧树 + * + * @param params + * @return + */ + public Map getSearchTree(SearchTreeParams params); +} diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index bc1f8b5d..72dffa3d 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -205,6 +205,8 @@ public class ExtServiceImpl extends Service implements ExtService { } map.put(key, value); } + // 遍历Map + if (null != id) { // 判断更新还是插入 int count = getExtMapper().countExtById(tableName, id); diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java new file mode 100644 index 00000000..607488b3 --- /dev/null +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -0,0 +1,213 @@ +package com.engine.organization.service.impl; + +import com.engine.core.impl.Service; +import com.engine.organization.entity.DeleteParam; +import com.engine.organization.entity.company.bo.CompBO; +import com.engine.organization.entity.company.po.CompPO; +import com.engine.organization.entity.department.bo.DepartmentBO; +import com.engine.organization.entity.department.po.DepartmentPO; +import com.engine.organization.entity.job.bo.JobBO; +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.mapper.comp.CompMapper; +import com.engine.organization.mapper.department.DepartmentMapper; +import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.service.HrmResourceService; +import com.engine.organization.util.db.MapperProxyFactory; +import com.engine.organization.util.tree.SearchTreeUtil; +import org.apache.commons.collections.CollectionUtils; +import weaver.general.StringUtil; +import weaver.general.Util; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author:dxfeng + * @createTime: 2022/06/20 + * @version: 1.0 + */ +public class HrmResourceServiceImpl extends Service implements HrmResourceService { + /** + * 左侧树 类型表示 + *

+ * 0：集团 + * 1：分部 + * 2：部门 + * 3：岗位 + */ + private static final String TYPE_COMP = "1"; + private static final String TYPE_DEPT = "2"; + private static final String TYPE_JOB = "3"; + + private DepartmentMapper getDepartmentMapper() { + return MapperProxyFactory.getProxy(DepartmentMapper.class); + } + + private CompMapper getCompMapper() { + return MapperProxyFactory.getProxy(CompMapper.class); + } + + private JobMapper getJobMapper() { + return MapperProxyFactory.getProxy(JobMapper.class); + } + + @Override + public Map getSearchTree(SearchTreeParams params) { + String keyword = params.getKeyword(); + String id = params.getId(); + String type = Util.null2String(params.getType()); + List treeList = getFilterCompany(id, type, keyword); + return SearchTreeUtil.getSearchTree(type, treeList); + } + + public List getFilterCompany(String id, String type, String keyword) { + List searchTree = new ArrayList<>(); + // 通过分部、公司 组装数据 + if (StringUtil.isEmpty(id) || TYPE_COMP.equals(type)) { + Long parentCompId = StringUtil.isEmpty(id) ? null : Long.parseLong(id); + DepartmentPO departmentBuild = DepartmentPO.builder().deptName(keyword).parentComp(parentCompId).build(); + CompPO compBuild = CompPO.builder().compName(keyword).parentCompany(parentCompId).build(); + // 所属分部下的岗位 + JobPO jobBuild = JobPO.builder().jobName(keyword).parentComp(parentCompId).build(); + searchTree = buildTreeByCompAndDept(departmentBuild, compBuild, jobBuild); + } else if (TYPE_DEPT.equals(type)) { + Long parentDeptId = Long.parseLong(id); + DepartmentPO departmentBuild = DepartmentPO.builder().deptName(keyword).parentDept(parentDeptId).build(); + // 所属分部下的岗位 + JobPO jobBuild = JobPO.builder().jobName(keyword).parentDept(parentDeptId).build(); + searchTree = buildTreeByDeptAndJob(departmentBuild, jobBuild); + + } else if (TYPE_JOB.equals(type)) { + // 查询部门信息 + List filterDeparts = getJobMapper().listPOsByFilter(JobPO.builder().jobName(keyword).parentJob(Long.parseLong(id)).build()); + Set builderJobs = new HashSet<>(); + for (JobPO departmentPO : filterDeparts) { + buildParentJobs(departmentPO, builderJobs); + } + searchTree = SearchTreeUtil.builderTreeMode(JobBO.buildSetToSearchTree(builderJobs)); + } + return searchTree; + } + + /** + * 分部、部门 组装左侧树 + * + * @param departmentBuild + * @param compBuild + * @param jobBuild + * @return + */ + private List buildTreeByCompAndDept(DepartmentPO departmentBuild, CompPO compBuild, JobPO jobBuild) { + List jobPOS = getJobMapper().listPOsByFilter(jobBuild); + List filterDeparts = getDepartmentMapper().listByFilter(departmentBuild); + // 添加父级岗位 + Set builderJobs = new HashSet<>(); + for (JobPO jobPO : jobPOS) { + buildParentJobs(jobPO, builderJobs); + } + // 添加岗位的上级部门或分部 + List jobTrees = SearchTreeUtil.builderTreeMode(JobBO.buildSetToSearchTree(builderJobs)); + String parentDeptS = jobTrees.stream().map(SearchTree::getParentComp).collect(Collectors.joining(",")); + if (!StringUtil.isEmpty(parentDeptS)) { + List compsByIds = getDepartmentMapper().getDeptsByIds(DeleteParam.builder().ids(parentDeptS).build().getIds()); + if (CollectionUtils.isNotEmpty(compsByIds)) { + filterDeparts.addAll(compsByIds); + } + } + + // 查询分部信息 + List filterComps = getCompMapper().listByFilter(compBuild); + Set builderDeparts = new HashSet<>(); + for (DepartmentPO departmentPO : filterDeparts) { + buildParentDepts(departmentPO, builderDeparts); + } + List deptTrees = SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts,false)); + // 添加部门的上级分部 + String parentCompS = deptTrees.stream().map(SearchTree::getParentComp).collect(Collectors.joining(",")); + if (!StringUtil.isEmpty(parentCompS)) { + List compsByIds = getCompMapper().getCompsByIds(DeleteParam.builder().ids(parentCompS).build().getIds()); + if (CollectionUtils.isNotEmpty(compsByIds)) { + filterComps.addAll(compsByIds); + } + } + Set builderComps = new HashSet<>(); + for (CompPO compPO : filterComps) { + buildParentComps(compPO, builderComps); + } + List searchTrees = SearchTreeUtil.builderTreeMode(deptTrees, jobTrees); + return SearchTreeUtil.builderTreeMode(CompBO.buildSetToSearchTree(builderComps), searchTrees); + } + + private List buildTreeByDeptAndJob(DepartmentPO departmentBuild, JobPO jobBuild) { + List jobPOS = getJobMapper().listPOsByFilter(jobBuild); + List filterDeparts = getDepartmentMapper().listByFilter(departmentBuild); + // 添加父级岗位 + Set builderJobs = new HashSet<>(); + for (JobPO jobPO : jobPOS) { + buildParentJobs(jobPO, builderJobs); + } + // 添加岗位的上级部门或分部 + List jobTrees = SearchTreeUtil.builderTreeMode(JobBO.buildSetToSearchTree(builderJobs)); + String parentDeptS = jobTrees.stream().map(SearchTree::getParentComp).collect(Collectors.joining(",")); + if (!StringUtil.isEmpty(parentDeptS)) { + List compsByIds = getDepartmentMapper().getDeptsByIds(DeleteParam.builder().ids(parentDeptS).build().getIds()); + if (CollectionUtils.isNotEmpty(compsByIds)) { + filterDeparts.addAll(compsByIds); + } + } + + // 查询分部信息 + Set builderDeparts = new HashSet<>(); + for (DepartmentPO departmentPO : filterDeparts) { + buildParentDepts(departmentPO, builderDeparts); + } + return SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts,false), jobTrees); + } + + private void buildParentJobs(JobPO jobPO, Set builderJobs) { + builderJobs.add(jobPO); + if (SearchTreeUtil.isTop(jobPO.getParentJob())) { + return; + } + JobPO parentJob = getJobMapper().getJobById(jobPO.getParentJob()); + if (null != parentJob) { + buildParentJobs(parentJob, builderJobs); + } + } + + /** + * 添加查询元素的父级元素 + * + * @param departmentPO + * @param builderDeparts + */ + private void buildParentDepts(DepartmentPO departmentPO, Set builderDeparts) { + builderDeparts.add(departmentPO); + if (SearchTreeUtil.isTop(departmentPO.getParentDept())) { + return; + } + DepartmentPO parentDept = getDepartmentMapper().getDeptById(departmentPO.getParentDept()); + if (null != parentDept) { + buildParentDepts(parentDept, builderDeparts); + } + } + + /** + * 添加查询元素的父级元素 + * + * @param compPO + * @param builderComps + */ + private void buildParentComps(CompPO compPO, Set builderComps) { + builderComps.add(compPO); + if (SearchTreeUtil.isTop(compPO.getParentCompany())) { + return; + } + CompPO parentComp = getCompMapper().listById(compPO.getParentCompany()); + if (null != parentComp) { + buildParentComps(parentComp, builderComps); + } + } +} From 187be45bdfef2bd05e1bcac77388cd56872c1c14 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 21 Jun 2022 13:49:37 +0800 Subject: [PATCH 09/27] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E5=B7=A6=E4=BE=A7=E6=A0=91=E3=80=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/HrmResourceController.java | 12 ++ .../entity/department/bo/DepartmentBO.java | 4 +- .../entity/extend/bo/ExtendInfoBO.java | 29 +++- .../extend/param/ExtendInfoFieldParam.java | 18 -- .../param/HrmResourceSearchParam.java | 57 ++++++ .../entity/hrmresource/po/HrmResourcePO.java | 164 ++++++++++++++++++ .../entity/hrmresource/vo/HrmResourceVO.java | 78 +++++++++ .../mapper/department/DepartmentMapper.java | 2 +- .../service/HrmResourceService.java | 11 +- .../service/impl/DepartmentServiceImpl.java | 2 +- .../service/impl/ExtServiceImpl.java | 13 +- .../service/impl/HrmResourceServiceImpl.java | 69 +++++++- .../transmethod/HrmResourceTransMethod.java | 26 +++ .../web/HrmResourceController.java | 71 ++++++++ .../wrapper/HrmResourceWrapper.java | 31 ++++ 15 files changed, 555 insertions(+), 32 deletions(-) create mode 100644 src/com/api/organization/web/HrmResourceController.java create mode 100644 src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java create mode 100644 src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java create mode 100644 src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java create mode 100644 src/com/engine/organization/transmethod/HrmResourceTransMethod.java create mode 100644 src/com/engine/organization/web/HrmResourceController.java create mode 100644 src/com/engine/organization/wrapper/HrmResourceWrapper.java diff --git a/src/com/api/organization/web/HrmResourceController.java b/src/com/api/organization/web/HrmResourceController.java new file mode 100644 index 00000000..bcb62d46 --- /dev/null +++ b/src/com/api/organization/web/HrmResourceController.java @@ -0,0 +1,12 @@ +package com.api.organization.web; + +import javax.ws.rs.Path; + +/** + * @author:dxfeng + * @createTime: 2022/06/21 + * @version: 1.0 + */ +@Path("/bs/hrmorganization/hrmresource") +public class HrmResourceController extends com.engine.organization.web.HrmResourceController{ +} diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 93ffbdae..1e46142b 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -109,7 +109,7 @@ public class DepartmentBO { .deptName(e.getDeptName()) .parentComp(e.getParentComp()) .parentDept(e.getParentDept()) - .parentDeptName(e.getParentDept() == null ? "" : getDeptNameById(e.getParentDept().intValue())) + .parentDeptName(e.getParentDept() == null ? "" : getDeptNameById(e.getParentDept())) .deptPrincipalName(getEmployeeNameById(e.getDeptPrincipal())) .build()).collect(Collectors.toList()); //获取非一级部门 @@ -142,7 +142,7 @@ public class DepartmentBO { } - public static String getDeptNameById(Integer id) { + public static String getDeptNameById(Long id) { return MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptNameById(id); } diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index d3ad4d45..e9650393 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -1,5 +1,7 @@ package com.engine.organization.entity.extend.bo; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.api.browser.bean.BrowserBean; import com.api.browser.bean.BrowserValueInfo; import com.api.browser.bean.SearchConditionItem; @@ -106,7 +108,7 @@ public class ExtendInfoBO { .editShow("0".equals(infoFieldParam.getIsModify()) ? 0 : 1) .addShow(1) .browserShow(1) - .customValue(infoFieldParam.getFieldType().toString()) + .customValue(convertSelectCustom(controlType, infoFieldParam.getFieldType().toString())) .showOrder(showOrder) // 非系统初始化字段 .isSystemDefault(1) @@ -116,6 +118,31 @@ public class ExtendInfoBO { .build(); } + private static String convertSelectCustom(String controlType, String fieldType) { + if (!"5".equals(controlType)) { + return fieldType; + } + JSONArray objects = JSONObject.parseArray(fieldType); + if (objects.size() < 3) { + return objects.toString(); + } + JSONObject o = (JSONObject) objects.get(2); + JSONArray datas = o.getJSONArray("datas"); + if (!datas.isEmpty()) { + int size = datas.size(); + for (int i = 0; i < size; i++) { + JSONObject jsonObject = (JSONObject) datas.get(i); + if (StringUtils.isBlank(jsonObject.getString("id"))) { + jsonObject.put("id", i + ""); + } + if (StringUtils.isBlank(jsonObject.getString("key"))) { + jsonObject.put("key", i + ""); + } + } + } + return objects.toString(); + } + /** * 当前自定义字段是否已使用 * diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java index 7e055d9c..e8ea88b0 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java @@ -7,7 +7,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang.StringUtils; import weaver.general.Util; /** @@ -110,21 +109,4 @@ public class ExtendInfoFieldParam { } return fp.getFielddbtype(); } - - public static String toDbc(String input) { - if (StringUtils.isBlank(input)) { - return ""; - } - char[] c = input.toCharArray(); - for (int i = 0; i < c.length; i++) { - if (c[i] == 12288) { - c[i] = (char) 32; - continue; - } - if (c[i] > 65280 && c[i] < 65375) { - c[i] = (char) (c[i] - 65248); - } - } - return new String(c); - } } \ No newline at end of file diff --git a/src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java b/src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java new file mode 100644 index 00000000..5ac816b4 --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java @@ -0,0 +1,57 @@ +package com.engine.organization.entity.hrmresource.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/06/21 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class HrmResourceSearchParam { + /** + * 姓名 + */ + private String lastName; + + /** + * 直接上级 + */ + private Long managerId; + + /** + * 分部 + */ + private Long companyId; + + /** + * 部门 + */ + private Long departmentId; + + /** + * 移动电话 + */ + private String mobile; + + /** + * 办公电话 + */ + private String telephone; + + /** + * 其他电话 + */ + private String mobileCall; + + /** + * 岗位 + */ + private Long jobTitle; +} diff --git a/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java b/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java new file mode 100644 index 00000000..678f639a --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/po/HrmResourcePO.java @@ -0,0 +1,164 @@ +package com.engine.organization.entity.hrmresource.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @author:dxfeng + * @createTime: 2022/06/21 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class HrmResourcePO { + /** + * id + */ + private Long id; + + /** + * 编号 + */ + private String workCode; + + /** + * 登录名 + */ + private String loginId; + + /** + * 姓名 + */ + private String lastName; + + /** + * 性别 + */ + private Integer sex; + + /** + * 账号类型 + */ + private Integer accountType; + + /** + * 主账号 + */ + private Long belongTo; + + /** + * 部门 + */ + private Long departmentId; + + /** + * 分部 + */ + private Long companyId; + + /** + * 职务 + */ + private Long jobActivity; + + /** + * 岗位 + */ + private Long jobTitle; + + /** + * 职称 + */ + private Long jobCall; + + /** + * 职级 + */ + private Long jobLevel; + + /** + * 职务类别 + */ + private Long jobGroupId; + + /** + * 职责描述 + */ + private String jobActivityDesc; + + /** + * 状态 + */ + private Integer status; + + /** + * 系统语言 + */ + private Integer systemLanguage; + + /** + * 照片 + */ + private String resourceImageId; + + /** + * 头像 + */ + private String messagerUrl; + + /** + * 办公地点 + */ + private Integer locationId; + + /** + * 直接上级 + */ + private Long managerId; + + /** + * 助理 + */ + private Long assistantId; + + /** + * 移动电话 + */ + private String mobile; + + /** + * 办公室电话 + */ + private String telephone; + + /** + * 其他电话 + */ + private String mobileCall; + + /** + * 传真 + */ + private String fax; + + /** + * 电子邮件 + */ + private String email; + + /** + * 办公室 + */ + private String workroom; + + private Long creator; + private int deleteType; + private Date createTime; + private Date updateTime; +} diff --git a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java new file mode 100644 index 00000000..58db8892 --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java @@ -0,0 +1,78 @@ +package com.engine.organization.entity.hrmresource.vo; + +import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.organization.annotation.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/06/21 + * @version: 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@OrganizationTable(pageId = "c0583f20-f10c-11ec-9947-00e04c680716", + fields = "t.id," + + "t.last_name," + + "t.department_id," + + "t.company_id," + + "t.mobile," + + "t.telephone," + + "t.manager_id,", + fromSql = "FROM jcl_org_hrmresource t ", + orderby = "id desc", + primarykey = "id", + operates = { + @OrganizationTableOperate(index = "0", text = "发消息"), + @OrganizationTableOperate(index = "1", text = "发送邮件"), + @OrganizationTableOperate(index = "1", text = "发送短信"), + @OrganizationTableOperate(index = "1", text = "新建日程"), + @OrganizationTableOperate(index = "1", text = "系统信息"), + }, + tableType = WeaTableType.CHECKBOX +) +public class HrmResourceVO { + /** + * 主键 + */ + @OrganizationTableColumn(column = "id", display = false) + private Long id; + + /** + * 姓名 + */ + @OrganizationTableColumn(text = "姓名", width = "25%", column = "last_name") + private String lastName; + /** + * 部门 + */ + @OrganizationTableColumn(text = "部门", width = "25%", column = "department_id", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getDepartmentName") + private String departmentName; + + /** + * 分部 + */ + @OrganizationTableColumn(text = "分部", width = "25%", column = "company_id", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getCompanyName") + private String companyName; + + /** + * 移动电话 + */ + @OrganizationTableColumn(text = "移动电话", width = "25%", column = "mobile") + private String mobile; + /** + * 办公室电话 + */ + @OrganizationTableColumn(text = "办公室电话", width = "25%", column = "telephone") + private String telephone; + /** + * 直接上级 + */ + @OrganizationTableColumn(text = "直接上级", width = "25%", column = "manager_id", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getManagerName") + private String managerName; +} diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.java b/src/com/engine/organization/mapper/department/DepartmentMapper.java index e9236362..d1252941 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.java +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.java @@ -68,7 +68,7 @@ public interface DepartmentMapper { * @param id * @return */ - String getDeptNameById(@Param("id") int id); + String getDeptNameById(@Param("id") Long id); /** * 添加数据 diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java index 4440c006..6b915248 100644 --- a/src/com/engine/organization/service/HrmResourceService.java +++ b/src/com/engine/organization/service/HrmResourceService.java @@ -1,5 +1,6 @@ package com.engine.organization.service; +import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; import com.engine.organization.entity.searchtree.SearchTreeParams; import java.util.Map; @@ -17,5 +18,13 @@ public interface HrmResourceService { * @param params * @return */ - public Map getSearchTree(SearchTreeParams params); + Map getSearchTree(SearchTreeParams params); + + /** + * 人员列表 + * + * @param params + * @return + */ + Map listPage(HrmResourceSearchParam params); } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 798f3350..ad371183 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -395,7 +395,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService deptBrowserItem.setRules("required|string"); SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "合并后名称", "mergeName"); mergeNameItem.setRules("required|string"); - String departmentName = getDepartmentMapper().getDeptNameById(id.intValue()); + String departmentName = getDepartmentMapper().getDeptNameById(id); mergeNameItem.setValue(departmentName); condition.add(deptBrowserItem); diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 72dffa3d..34793715 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -188,24 +188,25 @@ public class ExtServiceImpl extends Service implements ExtService { int updateBaseComp; List extInfoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.EDIT.getValue()); Map map = new HashMap<>(); - for (ExtendInfoPO extendInfoPO : extInfoPOList) { - String key = extendInfoPO.getFieldName(); - Object value = params.get(extendInfoPO.getFieldName()); + // 遍历Map + Map collect = extInfoPOList.stream().collect(Collectors.toMap(ExtendInfoPO::getFieldName, item -> item)); + for (Map.Entry entry : params.entrySet()) { + String key = entry.getKey(); + Object value = entry.getValue(); if (null != value && StringUtils.isBlank(value.toString())) { value = null; } if (null == value) { - if ("int".equals(extendInfoPO.getFieldType())) { + if ("int".equals(collect.get(key).getFieldType())) { value = null; } // 兼容sqlServer数据库text字段类型 - if ("text".equals(extendInfoPO.getFieldType())) { + if ("text".equals(collect.get(key).getFieldType())) { value = ""; } } map.put(key, value); } - // 遍历Map if (null != id) { // 判断更新还是插入 diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 607488b3..5e6940b9 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -1,11 +1,15 @@ package com.engine.organization.service.impl; +import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; +import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.po.DepartmentPO; +import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; +import com.engine.organization.entity.hrmresource.vo.HrmResourceVO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.searchtree.SearchTree; @@ -14,9 +18,12 @@ import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.HrmResourceService; +import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; @@ -62,6 +69,64 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return SearchTreeUtil.getSearchTree(type, treeList); } + @Override + public Map listPage(HrmResourceSearchParam params) { + Map resultMap = new HashMap<>(); + OrganizationWeaTable table = new OrganizationWeaTable<>(user, HrmResourceVO.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; + } + + /** + * 查询条件 + * + * @param params + * @return + */ + private String buildSqlWhere(HrmResourceSearchParam params) { + DBType dbType = DBType.get(new RecordSet().getDBType()); + String sqlWhere = " where t.delete_type ='0' "; + String lastName = params.getLastName(); + if (StringUtils.isNotBlank(lastName)) { + sqlWhere += " AND t.last_name " + dbType.like(lastName); + } + Long managerId = params.getManagerId(); + if (null != managerId) { + sqlWhere += " AND t.manager_id = '" + managerId + "'"; + } + Long companyId = params.getCompanyId(); + if (null != companyId) { + sqlWhere += " AND t.company_id = '" + companyId + "'"; + } + Long departmentId = params.getDepartmentId(); + if (null != departmentId) { + sqlWhere += " AND t.department_id = '" + departmentId + "'"; + } + String telephone = params.getTelephone(); + if (StringUtils.isNotBlank(telephone)) { + sqlWhere += " AND t.telephone " + dbType.like(telephone); + } + String mobile = params.getMobile(); + if (StringUtils.isNotBlank(mobile)) { + sqlWhere += " AND t.mobile " + dbType.like(mobile); + } + String mobileCall = params.getMobileCall(); + if (StringUtils.isNotBlank(mobileCall)) { + sqlWhere += " AND t.mobile_call " + dbType.like(mobileCall); + } + Long jobTitle = params.getJobTitle(); + if (null != jobTitle) { + sqlWhere += " AND t.job_title = '" + jobTitle + "'"; + } + + return sqlWhere; + } + public List getFilterCompany(String id, String type, String keyword) { List searchTree = new ArrayList<>(); // 通过分部、公司 组装数据 @@ -123,7 +188,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic for (DepartmentPO departmentPO : filterDeparts) { buildParentDepts(departmentPO, builderDeparts); } - List deptTrees = SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts,false)); + List deptTrees = SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts, false)); // 添加部门的上级分部 String parentCompS = deptTrees.stream().map(SearchTree::getParentComp).collect(Collectors.joining(",")); if (!StringUtil.isEmpty(parentCompS)) { @@ -163,7 +228,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic for (DepartmentPO departmentPO : filterDeparts) { buildParentDepts(departmentPO, builderDeparts); } - return SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts,false), jobTrees); + return SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts, false), jobTrees); } private void buildParentJobs(JobPO jobPO, Set builderJobs) { diff --git a/src/com/engine/organization/transmethod/HrmResourceTransMethod.java b/src/com/engine/organization/transmethod/HrmResourceTransMethod.java new file mode 100644 index 00000000..23d79f3c --- /dev/null +++ b/src/com/engine/organization/transmethod/HrmResourceTransMethod.java @@ -0,0 +1,26 @@ +package com.engine.organization.transmethod; + +import com.engine.organization.mapper.comp.CompMapper; +import com.engine.organization.mapper.department.DepartmentMapper; +import com.engine.organization.mapper.employee.EmployeeMapper; +import com.engine.organization.util.db.MapperProxyFactory; + +/** + * @author:dxfeng + * @createTime: 2022/06/21 + * @version: 1.0 + */ +public class HrmResourceTransMethod { + + public static String getDepartmentName(String departmentId) { + return MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptNameById(Long.parseLong(departmentId)); + } + + public static String getCompanyName(String companyId) { + return MapperProxyFactory.getProxy(CompMapper.class).listById(Long.parseLong(companyId)).getCompName(); + } + + public static String getManagerName(String managerId) { + return MapperProxyFactory.getProxy(EmployeeMapper.class).getEmployeeNameById(Long.parseLong(managerId)); + } +} diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java new file mode 100644 index 00000000..11d4adc6 --- /dev/null +++ b/src/com/engine/organization/web/HrmResourceController.java @@ -0,0 +1,71 @@ +package com.engine.organization.web; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.engine.common.util.ParamUtil; +import com.engine.common.util.ServiceUtil; +import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; +import com.engine.organization.entity.searchtree.SearchTreeParams; +import com.engine.organization.util.response.ReturnResult; +import com.engine.organization.wrapper.HrmResourceWrapper; +import weaver.hrm.HrmUserVarify; +import weaver.hrm.User; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import java.util.Map; + +/** + * @author:dxfeng + * @createTime: 2022/06/21 + * @version: 1.0 + */ +public class HrmResourceController { + public HrmResourceWrapper getHrmResourceWrapper(User user) { + return ServiceUtil.getService(HrmResourceWrapper.class, user); + } + + /** + * 左侧树接口 + * + * @param request + * @param response + * @return + */ + @GET + @Path("/getSearchTree") + @Produces(MediaType.APPLICATION_JSON) + public Map getSearchTree(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + SearchTreeParams params = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), SearchTreeParams.class); + return getHrmResourceWrapper(user).getSearchTree(params); + + } + + /** + * 获取list列表 + * + * @param request + * @param response + * @return + */ + @GET + @Path("/listPage") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult listPage(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + HrmResourceSearchParam param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), HrmResourceSearchParam.class); + return ReturnResult.successed(getHrmResourceWrapper(user).listPage(param)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } +} diff --git a/src/com/engine/organization/wrapper/HrmResourceWrapper.java b/src/com/engine/organization/wrapper/HrmResourceWrapper.java new file mode 100644 index 00000000..50835435 --- /dev/null +++ b/src/com/engine/organization/wrapper/HrmResourceWrapper.java @@ -0,0 +1,31 @@ +package com.engine.organization.wrapper; + +import com.engine.common.util.ServiceUtil; +import com.engine.core.impl.Service; +import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; +import com.engine.organization.entity.searchtree.SearchTreeParams; +import com.engine.organization.service.HrmResourceService; +import com.engine.organization.service.impl.HrmResourceServiceImpl; +import weaver.hrm.User; + +import java.util.Map; + +/** + * @author:dxfeng + * @createTime: 2022/06/21 + * @version: 1.0 + */ +public class HrmResourceWrapper extends Service { + private HrmResourceService getHrmResourceService(User user) { + return ServiceUtil.getService(HrmResourceServiceImpl.class, user); + } + + + public Map getSearchTree(SearchTreeParams params) { + return getHrmResourceService(user).getSearchTree(params); + } + + public Map listPage(HrmResourceSearchParam params) { + return getHrmResourceService(user).listPage(params); + } +} From 5b6cf8fe7230eabde745c211476db43390d47de1 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 21 Jun 2022 16:47:39 +0800 Subject: [PATCH 10/27] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/hrmresource/vo/HrmResourceVO.java | 4 +- .../service/HrmResourceService.java | 31 +++++ .../service/impl/ExtServiceImpl.java | 30 +++-- .../service/impl/HrmResourceServiceImpl.java | 115 ++++++++++++++++++ .../web/HrmResourceController.java | 80 ++++++++++++ .../wrapper/HrmResourceWrapper.java | 16 +++ 6 files changed, 261 insertions(+), 15 deletions(-) diff --git a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java index 58db8892..a23c5e4e 100644 --- a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java +++ b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java @@ -23,9 +23,9 @@ import lombok.NoArgsConstructor; "t.company_id," + "t.mobile," + "t.telephone," + - "t.manager_id,", + "t.manager_id ", fromSql = "FROM jcl_org_hrmresource t ", - orderby = "id desc", + orderby = " id ", primarykey = "id", operates = { @OrganizationTableOperate(index = "0", text = "发消息"), diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java index 6b915248..7d1f6c48 100644 --- a/src/com/engine/organization/service/HrmResourceService.java +++ b/src/com/engine/organization/service/HrmResourceService.java @@ -27,4 +27,35 @@ public interface HrmResourceService { * @return */ Map listPage(HrmResourceSearchParam params); + + /** + * 获取新增表单 + * + * @return + */ + Map getSaveForm(); + + /** + * 新增 + * + * @param params + * @return + */ + int saveBaseForm(Map params); + + /** + * 获取基本信息表单 + * + * @param params + * @return + */ + Map getBaseForm(Map params); + + /** + * 更新 + * + * @param params + * @return + */ + int updateForm(Map params); } diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 34793715..fa26643e 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -105,7 +105,7 @@ public class ExtServiceImpl extends Service implements ExtService { item.setViewAttr(3); item.setRules("required"); } - if (extendInfoPO.getFieldName().equals(autoNoField)) { + if (null != autoNoField && extendInfoPO.getFieldName().equals(autoNoField)) { // 判断是否开启自动编号 CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(serialType); if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { @@ -186,26 +186,28 @@ public class ExtServiceImpl extends Service implements ExtService { @Override public int updateExtForm(User user, String extendType, String tableName, Map params, String groupId, Long id) { int updateBaseComp; - List extInfoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.EDIT.getValue()); + List extInfoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ""); Map map = new HashMap<>(); // 遍历Map Map collect = extInfoPOList.stream().collect(Collectors.toMap(ExtendInfoPO::getFieldName, item -> item)); for (Map.Entry entry : params.entrySet()) { String key = entry.getKey(); - Object value = entry.getValue(); - if (null != value && StringUtils.isBlank(value.toString())) { - value = null; - } - if (null == value) { - if ("int".equals(collect.get(key).getFieldType())) { + if (collect.containsKey(key)) { + Object value = entry.getValue(); + if (null != value && StringUtils.isBlank(value.toString())) { value = null; } - // 兼容sqlServer数据库text字段类型 - if ("text".equals(collect.get(key).getFieldType())) { - value = ""; + if (null == value) { + if ("int".equals(collect.get(key).getFieldType())) { + value = null; + } + // 兼容sqlServer数据库text字段类型 + if ("text".equals(collect.get(key).getFieldType())) { + value = ""; + } } + map.put(key, value); } - map.put(key, value); } if (null != id) { @@ -223,7 +225,9 @@ public class ExtServiceImpl extends Service implements ExtService { updateBaseComp = getExtMapper().insertExt(tableName, map); } } else { - map.put("forbidden_tag", 0); + if (!tableName.equals("JCL_ORG_HRMRESOURCE")) { + map.put("forbidden_tag", 0); + } map.put("creator", user.getUID()); map.put("delete_type", 0); map.put("create_time", new Date()); diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 5e6940b9..35d6631c 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -1,6 +1,8 @@ package com.engine.organization.service.impl; +import com.api.browser.bean.SearchConditionGroup; import com.cloudstore.eccom.result.WeaResultMsg; +import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.DeleteParam; @@ -8,6 +10,7 @@ import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.po.DepartmentPO; +import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; import com.engine.organization.entity.hrmresource.vo.HrmResourceVO; import com.engine.organization.entity.job.bo.JobBO; @@ -16,8 +19,11 @@ import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; 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.JobMapper; +import com.engine.organization.service.ExtService; import com.engine.organization.service.HrmResourceService; +import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.tree.SearchTreeUtil; @@ -26,6 +32,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.User; import java.util.*; import java.util.stream.Collectors; @@ -48,6 +55,30 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic private static final String TYPE_DEPT = "2"; private static final String TYPE_JOB = "3"; + private static final Long GROUP_ID = 4L; + + /** + * 分组类型 + * 1：分部 + * 2：部门 + * 3：岗位 + * 4：人员 + */ + private static final String EXTEND_TYPE = "4"; + + /** + * 主表表名 + */ + private static final String JCL_ORG_HRM = "JCL_ORG_HRMRESOURCE"; + /** + * 主表拓展表 + */ + private static final String JCL_ORG_HRMEXT = "JCL_ORG_HRMRESOURCEEXT"; + /** + * 明细表拓展表 + */ + private static final String JCL_ORG_HRMEXT_DT1 = "JCL_ORG_HRMRESOURCEEXT_DT1"; + private DepartmentMapper getDepartmentMapper() { return MapperProxyFactory.getProxy(DepartmentMapper.class); } @@ -60,6 +91,14 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return MapperProxyFactory.getProxy(JobMapper.class); } + private ExtendTitleMapper getExtendTitleMapper() { + return MapperProxyFactory.getProxy(ExtendTitleMapper.class); + } + + private ExtService getExtService(User user) { + return ServiceUtil.getService(ExtServiceImpl.class, user); + } + @Override public Map getSearchTree(SearchTreeParams params) { String keyword = params.getKeyword(); @@ -82,6 +121,82 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return resultMap; } + @Override + public Map getSaveForm() { + Map apiDatas = new HashMap<>(); + List addGroups = new ArrayList<>(); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID); + if (CollectionUtils.isNotEmpty(extendTitles)) { + for (ExtendTitlePO extendTitle : extendTitles) { + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_HRM, 2, extendTitle.getId() + "", null, null))); + } + } + apiDatas.put("condition", addGroups); + return apiDatas; + } + + @Override + public int saveBaseForm(Map params) { + return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_HRM, params, "", null); + } + + @Override + public Map getBaseForm(Map params) { + OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); + // 2编辑 1查看 + int viewAttr = Integer.parseInt((String) params.get("viewAttr")); + long id = Long.parseLong((String) params.get("id")); + String groupId = (String) params.get("viewCondition"); + + HashMap buttonsMap = new HashMap<>(); + buttonsMap.put("hasEdit", true); + buttonsMap.put("hasSave", true); + + List addGroups = new ArrayList<>(); + if ("0".equals(groupId)) { + groupId = GROUP_ID.toString(); + } + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(Long.parseLong(groupId)); + + if (CollectionUtils.isNotEmpty(extendTitles)) { + for (ExtendTitlePO extendTitle : extendTitles) { + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_HRM : JCL_ORG_HRMEXT, viewAttr, id, extendTitle.getId() + "", ""))); + } + } + + HashMap resultMap = new HashMap<>(); + resultMap.put("buttons", buttonsMap); + resultMap.put("conditions", addGroups); + resultMap.put("id", id); + // 拓展页面分组 + resultMap.put("tabInfo", getExtService(user).getTabInfo(EXTEND_TYPE, JCL_ORG_HRMEXT)); + // 处理明细表 + resultMap.put("tables", getExtService(user).getExtendTables(user, EXTEND_TYPE, Long.parseLong(groupId), JCL_ORG_HRMEXT_DT1, id, viewAttr, false)); + Map apiDatas = new HashMap<>(); + + apiDatas.put("result", resultMap); + + return apiDatas; + } + + @Override + public int updateForm(Map params) { + Long id = Long.parseLong((String) params.get("id")); + String groupId = (String) params.get("viewCondition"); + if ("0".equals(groupId)) { + groupId = GROUP_ID.toString(); + } + int updateCount = 0; + // 更新主表数据 + updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_HRM, params, "", id); + // 更新主表拓展表 + updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_HRMEXT, params, groupId, id); + //更新明细表 + getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_HRMEXT_DT1, params, id); + + return updateCount; + } + /** * 查询条件 * diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java index 11d4adc6..af961909 100644 --- a/src/com/engine/organization/web/HrmResourceController.java +++ b/src/com/engine/organization/web/HrmResourceController.java @@ -8,12 +8,14 @@ import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.HrmResourceWrapper; +import io.swagger.v3.oas.annotations.parameters.RequestBody; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.GET; +import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; @@ -68,4 +70,82 @@ public class HrmResourceController { return ReturnResult.exceptionHandle(e.getMessage()); } } + + /** + * 获取新增表单 + * + * @param request + * @param response + * @return + */ + @GET + @Path("/getSaveForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getSaveForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getHrmResourceWrapper(user).getSaveForm()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + /** + * 新增保存 + * + * @param request + * @param response + * @return + */ + @POST + @Path("/saveBaseForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult saveBaseForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map params) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getHrmResourceWrapper(user).saveBaseForm(params)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + /** + * 获取基础表单 + * + * @param request + * @param response + * @return + */ + @GET + @Path("/getBaseForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getBaseForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + return ReturnResult.successed(getHrmResourceWrapper(user).getBaseForm(map)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + /** + * 更新表单 + * + * @param request + * @param response + * @return + */ + @POST + @Path("/updateForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult updateForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + return ReturnResult.successed(getHrmResourceWrapper(user).updateForm(map)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } } diff --git a/src/com/engine/organization/wrapper/HrmResourceWrapper.java b/src/com/engine/organization/wrapper/HrmResourceWrapper.java index 50835435..61a9c72f 100644 --- a/src/com/engine/organization/wrapper/HrmResourceWrapper.java +++ b/src/com/engine/organization/wrapper/HrmResourceWrapper.java @@ -28,4 +28,20 @@ public class HrmResourceWrapper extends Service { public Map listPage(HrmResourceSearchParam params) { return getHrmResourceService(user).listPage(params); } + + public Map getSaveForm() { + return getHrmResourceService(user).getSaveForm(); + } + + public int saveBaseForm(Map params) { + return getHrmResourceService(user).saveBaseForm(params); + } + + public Map getBaseForm(Map params) { + return getHrmResourceService(user).getBaseForm(params); + } + + public int updateForm(Map params) { + return getHrmResourceService(user).updateForm(params); + } } From d3bcc35f319e4b6da7b25da0e4efb04464652a39 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 21 Jun 2022 17:12:33 +0800 Subject: [PATCH 11/27] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/annotation/OrganizationTable.java | 7 +++++++ .../organization/component/OrganizationWeaTable.java | 4 ++++ .../organization/entity/scheme/vo/SchemeTableVO.java | 5 +++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/annotation/OrganizationTable.java b/src/com/engine/organization/annotation/OrganizationTable.java index ec6d14bb..7734c21e 100644 --- a/src/com/engine/organization/annotation/OrganizationTable.java +++ b/src/com/engine/organization/annotation/OrganizationTable.java @@ -55,6 +55,13 @@ public @interface OrganizationTable { */ boolean distinct() default false; + + /** + * 排序方式 + * @return + */ + String sortway() default "desc"; + /** * 操作按钮 */ diff --git a/src/com/engine/organization/component/OrganizationWeaTable.java b/src/com/engine/organization/component/OrganizationWeaTable.java index 35369fbf..43b56438 100644 --- a/src/com/engine/organization/component/OrganizationWeaTable.java +++ b/src/com/engine/organization/component/OrganizationWeaTable.java @@ -38,6 +38,10 @@ public class OrganizationWeaTable extends WeaTable { if (StringUtils.isNotBlank(orderby)) { super.setSqlorderby(orderby); } + String sortway = table.sortway(); + if (StringUtils.isNotBlank(sortway)) { + super.setSqlsortway(sortway); + } String groupby = table.groupby(); if (StringUtils.isNotBlank(groupby)) { super.setSqlgroupby(groupby); diff --git a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java index ed40b29c..c6434d87 100644 --- a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java @@ -24,7 +24,8 @@ import lombok.NoArgsConstructor; "t.create_time," + "t.update_time", fromSql = "FROM jcl_org_scheme t ", - orderby = "id desc", + orderby = "scheme_no", + sortway = "asc", primarykey = "id", operates = { @OrganizationTableOperate(index = "0", text = "编辑"), @@ -49,7 +50,7 @@ public class SchemeTableVO { /** * 方案编号 */ - @OrganizationTableColumn(text = "编号", width = "25%", column = "scheme_no") + @OrganizationTableColumn(text = "编号", width = "25%", column = "scheme_no", orderkey = "scheme_no") private String schemeNo; /** * 方案名称 From bdc813000e664551818c910917a9e23f8f58fdb8 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 21 Jun 2022 17:50:56 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=20=E6=98=AF=E5=90=A6=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E5=90=8D=E7=A7=B0=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/company/dto/CompListDTO.java | 2 +- .../department/dto/DepartmentListDTO.java | 2 +- .../entity/job/dto/JobListDTO.java | 2 +- .../entity/postion/vo/PostInfoTableVO.java | 2 +- .../entity/scheme/vo/GradeTableVO.java | 2 +- .../entity/scheme/vo/LevelTableVO.java | 2 +- .../entity/scheme/vo/SchemeTableVO.java | 2 +- .../entity/sequence/vo/SequenceTableVO.java | 2 +- .../service/HrmResourceService.java | 15 +++++++ .../service/impl/HrmResourceServiceImpl.java | 45 +++++++++++++++++++ .../web/HrmResourceController.java | 39 ++++++++++++++++ .../wrapper/HrmResourceWrapper.java | 8 ++++ 12 files changed, 115 insertions(+), 8 deletions(-) diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java index 1e630d21..5e13182b 100644 --- a/src/com/engine/organization/entity/company/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -82,7 +82,7 @@ public class CompListDTO { /** * 禁用标记 */ - @TableTitle(title = "禁用标记", dataIndex = "forbiddenTag", key = "forbiddenTag") + @TableTitle(title = "是否启用", dataIndex = "forbiddenTag", key = "forbiddenTag") private int forbiddenTag; /** diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index b7c24e29..301470cf 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -91,7 +91,7 @@ public class DepartmentListDTO { /** * 禁用标记 */ - @TableTitle(title = "禁用标记", dataIndex = "forbiddenTag", key = "forbiddenTag") + @TableTitle(title = "是否启用", dataIndex = "forbiddenTag", key = "forbiddenTag") private int forbiddenTag; /** * 操作列 diff --git a/src/com/engine/organization/entity/job/dto/JobListDTO.java b/src/com/engine/organization/entity/job/dto/JobListDTO.java index 28b7c573..676f22f6 100644 --- a/src/com/engine/organization/entity/job/dto/JobListDTO.java +++ b/src/com/engine/organization/entity/job/dto/JobListDTO.java @@ -85,7 +85,7 @@ public class JobListDTO { /** * 禁用标记 */ - @TableTitle(title = "禁用标记", dataIndex = "forbiddenTag", key = "forbiddenTag") + @TableTitle(title = "是否启用", dataIndex = "forbiddenTag", key = "forbiddenTag") private Integer forbiddenTag; /** diff --git a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java index 58bd87d5..b84dc5f3 100644 --- a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java +++ b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java @@ -81,6 +81,6 @@ public class PostInfoTableVO { /** * 禁用标记 */ - @OrganizationTableColumn(text = "禁用标记", width = "20%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java index ef037941..6a36d9db 100644 --- a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java @@ -82,6 +82,6 @@ public class GradeTableVO { /** * 禁用标记 */ - @OrganizationTableColumn(text = "禁用标记", width = "20%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") private int forbiddenTag; } diff --git a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java index f33db78a..1f05775d 100644 --- a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java @@ -73,6 +73,6 @@ public class LevelTableVO { /** * 禁用标记 */ - @OrganizationTableColumn(text = "禁用标记", width = "20%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java index ed40b29c..f17e3f26 100644 --- a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java @@ -66,6 +66,6 @@ public class SchemeTableVO { /** * 禁用标识 */ - @OrganizationTableColumn(text = "禁用标记", width = "25%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "25%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java index b061d363..c4c4e0e9 100644 --- a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java +++ b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java @@ -79,6 +79,6 @@ public class SequenceTableVO { /** * 禁用标记 */ - @OrganizationTableColumn(text = "禁用标记", width = "20%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java index 7d1f6c48..9afee6ed 100644 --- a/src/com/engine/organization/service/HrmResourceService.java +++ b/src/com/engine/organization/service/HrmResourceService.java @@ -58,4 +58,19 @@ public interface HrmResourceService { * @return */ int updateForm(Map params); + + /** + * 获取搜索条件 + * + * @param params + * @return + */ + Map getSearchCondition(Map params); + + /** + * 获取列表页面按钮信息 + * + * @return + */ + Map getHasRight(); } diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 35d6631c..e1cbc1ff 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -1,6 +1,7 @@ package com.engine.organization.service.impl; import com.api.browser.bean.SearchConditionGroup; +import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; @@ -23,7 +24,9 @@ import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.ExtService; import com.engine.organization.service.HrmResourceService; +import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; +import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.tree.SearchTreeUtil; @@ -197,6 +200,48 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return updateCount; } + @Override + public Map getSearchCondition(Map params) { + Map apiDatas = new HashMap<>(); + List addGroups = new ArrayList<>(); + List conditionItems = new ArrayList<>(); + SearchConditionItem lastNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "姓名", "lastName"); + SearchConditionItem managerIdItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "直接上级", "managerId"); + SearchConditionItem companyIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "分部", "161", "companyId", "compBrowser"); + SearchConditionItem departmentIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "161", "departmentId", "deptBrowser"); + SearchConditionItem telephoneItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "办公电话", "telephone"); + SearchConditionItem mobileItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "移动电话", "mobile"); + SearchConditionItem mobileCallItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "其他电话", "mobileCall"); + SearchConditionItem jobTitleItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位", "161", "jobTitle", "jobBrowser"); + + conditionItems.add(lastNameItem); + conditionItems.add(managerIdItem); + conditionItems.add(companyIdItem); + conditionItems.add(departmentIdItem); + conditionItems.add(telephoneItem); + conditionItems.add(mobileItem); + conditionItems.add(mobileCallItem); + conditionItems.add(jobTitleItem); + + addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); + apiDatas.put("conditions", addGroups); + return apiDatas; + } + + @Override + public Map getHasRight() { + Map btnDatas = new HashMap<>(); + ArrayList topMenuList = new ArrayList<>(); + ArrayList rightMenuList = new ArrayList<>(); + // 新建人员 + topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build()); + btnDatas.put("topMenu", topMenuList); + // 新建人员 + rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build()); + btnDatas.put("rightMenu", rightMenuList); + return btnDatas; + } + /** * 查询条件 * diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java index af961909..b3c5e9ac 100644 --- a/src/com/engine/organization/web/HrmResourceController.java +++ b/src/com/engine/organization/web/HrmResourceController.java @@ -148,4 +148,43 @@ public class HrmResourceController { return ReturnResult.exceptionHandle(e.getMessage()); } } + + /** + * 高级搜索条件 + * + * @param request + * @param response + * @return + */ + @GET + @Path("/getSearchCondition") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + return ReturnResult.successed(getHrmResourceWrapper(user).getSearchCondition(map)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + /** + * 列表页顶部按钮 + * + * @param request + * @param response + * @return + */ + @GET + @Path("/getHasRight") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getHrmResourceWrapper(user).getHasRight()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } } diff --git a/src/com/engine/organization/wrapper/HrmResourceWrapper.java b/src/com/engine/organization/wrapper/HrmResourceWrapper.java index 61a9c72f..938e8344 100644 --- a/src/com/engine/organization/wrapper/HrmResourceWrapper.java +++ b/src/com/engine/organization/wrapper/HrmResourceWrapper.java @@ -44,4 +44,12 @@ public class HrmResourceWrapper extends Service { public int updateForm(Map params) { return getHrmResourceService(user).updateForm(params); } + + public Map getSearchCondition(Map params) { + return getHrmResourceService(user).getSearchCondition(params); + } + + public Map getHasRight() { + return getHrmResourceService(user).getHasRight(); + } } From 9796bdc8233673bde9f1204fb418aec594f1458c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 21 Jun 2022 18:23:17 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/staff/vo/StaffPlanTableVO.java | 2 +- .../organization/service/impl/SchemeServiceImpl.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java index 01bae639..96d9e4c2 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java @@ -71,7 +71,7 @@ public class StaffPlanTableVO { /** * 状态 */ - @OrganizationTableColumn(text = "状态", width = "16%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "16%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 3ee3c742..6ad771c1 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -72,6 +72,12 @@ public class SchemeServiceImpl extends Service implements SchemeService { HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apidatas = new HashMap<>(); SchemePO schemePO = SchemeDTO.convertParamToPO(param, (long) user.getUID()); + // 更新前先查询下旧编号， + String oldSchemeNo = getSchemeMapper().getSchemeByID(schemePO.getId()).getSchemeNo(); + if (!oldSchemeNo.equals(schemePO.getSchemeNo())) { + List list = getSchemeMapper().listByNo(Util.null2String(schemePO.getSchemeNo())); + OrganizationAssert.isEmpty(list, "编号不允许重复"); + } getSchemeMapper().updateScheme(schemePO); return apidatas; } @@ -129,7 +135,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { textareaItem.setValue(schemePO.getSchemeDescription()); // 编辑状态下,编号只读 - schemeNoCondition.setViewAttr(1); + // schemeNoCondition.setViewAttr(1); } selectItems.add(schemeNoCondition); From 779e03cb32a5bb917a8708eaaca90814e610e3f0 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 21 Jun 2022 18:39:26 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/scheme/vo/LevelTableVO.java | 5 +++-- .../organization/service/impl/GradeServiceImpl.java | 7 ++++++- .../organization/service/impl/LevelServiceImpl.java | 8 +++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java index 1f05775d..46f8b8d2 100644 --- a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java @@ -26,7 +26,8 @@ import lombok.NoArgsConstructor; "t.create_time," + "t.update_time", fromSql = "FROM jcl_org_level t inner join jcl_org_scheme s on t.scheme_id = s.id ", - orderby = "id desc", + orderby = "level_no", + sortway = "asc", primarykey = "id", operates = { @OrganizationTableOperate(text = "编辑"), @@ -50,7 +51,7 @@ public class LevelTableVO { /** * 编号 */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "level_no") + @OrganizationTableColumn(text = "编号", width = "20%", column = "level_no", orderkey = "level_no") private String levelNo; /** * 名称 diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index c217bb8e..c465c0cd 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -83,6 +83,11 @@ public class GradeServiceImpl extends Service implements GradeService { public int updateGrade(GradeSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID()); + String oldGradeNo = getGradeMapper().getGradeByID(gradePO.getId()).getGradeNo(); + if (!oldGradeNo.equals(gradePO.getGradeNo())) { + List list = getGradeMapper().listByNo(Util.null2String(param.getGradeNo())); + OrganizationAssert.isEmpty(list, "编号不允许重复"); + } return getGradeMapper().updateGrade(gradePO); } @@ -155,7 +160,7 @@ public class GradeServiceImpl extends Service implements GradeService { levelBrowserItem.setBrowserConditionParam(levelBrowserBean); // 编辑状态下,编号只读 - gradeNoCondition.setViewAttr(1); + // gradeNoCondition.setViewAttr(1); } selectItems.add(gradeNoCondition); diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 01ff55dd..abbf4495 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -78,6 +78,12 @@ public class LevelServiceImpl extends Service implements LevelService { public int updateLevel(LevelSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID()); + // 更新前先查询下旧编号， + String oldLevelNo = getLevelMapper().getLevelByID(levelPO.getId()).getLevelNo(); + if (!oldLevelNo.equals(levelPO.getLevelNo())) { + List list = getLevelMapper().listByNo(Util.null2String(levelPO.getLevelNo())); + OrganizationAssert.isEmpty(list, "编号不允许重复"); + } return getLevelMapper().updateLevel(levelPO); } @@ -142,7 +148,7 @@ public class LevelServiceImpl extends Service implements LevelService { browserBean.setReplaceDatas(maps); browserItem.setBrowserConditionParam(browserBean); // 编辑状态下,编号只读 - levelNoCondition.setViewAttr(1); + // levelNoCondition.setViewAttr(1); } selectItems.add(levelNoCondition); From f72db1b5f9341ab52763f359ed198d1b9844452c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 22 Jun 2022 11:22:51 +0800 Subject: [PATCH 15/27] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E4=BA=8B?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/postion/dto/PostDTO.java | 1 - .../entity/postion/po/PostPO.java | 4 - .../entity/scheme/vo/GradeTableVO.java | 5 +- .../entity/sequence/vo/SequenceTableVO.java | 73 ++++++++++--------- .../organization/mapper/post/PostMapper.java | 9 --- .../organization/mapper/post/PostMapper.xml | 16 ---- .../mapper/scheme/LevelMapper.java | 14 +++- .../mapper/scheme/LevelMapper.xml | 12 +++ .../mapper/scheme/SchemeMapper.java | 8 ++ .../mapper/scheme/SchemeMapper.xml | 10 +++ .../organization/service/LevelService.java | 8 ++ .../organization/service/SchemeService.java | 10 +++ .../service/impl/GradeServiceImpl.java | 2 +- .../service/impl/LevelServiceImpl.java | 9 ++- .../service/impl/PostInfoServiceImpl.java | 26 ++++++- .../service/impl/PostServiceImpl.java | 10 +-- .../service/impl/SchemeServiceImpl.java | 23 ++++++ .../service/impl/SequenceServiceImpl.java | 7 +- .../organization/web/LevelController.java | 12 +++ .../organization/web/SchemeController.java | 12 +++ .../organization/wrapper/LevelWrapper.java | 5 ++ .../organization/wrapper/SchemeWrapper.java | 9 +++ 22 files changed, 202 insertions(+), 83 deletions(-) diff --git a/src/com/engine/organization/entity/postion/dto/PostDTO.java b/src/com/engine/organization/entity/postion/dto/PostDTO.java index 51de900f..b1058917 100644 --- a/src/com/engine/organization/entity/postion/dto/PostDTO.java +++ b/src/com/engine/organization/entity/postion/dto/PostDTO.java @@ -17,7 +17,6 @@ public class PostDTO { } return PostPO.builder() .id(postPO.getId() == null ? 0 : postPO.getId()) - .postNo(postPO.getPostNo() == null ? null : postPO.getPostNo()) .postName(postPO.getPostName() == null ? null : postPO.getPostName()) .description(postPO.getDescription() == null ? null : postPO.getDescription()) .deleteType(0) diff --git a/src/com/engine/organization/entity/postion/po/PostPO.java b/src/com/engine/organization/entity/postion/po/PostPO.java index e9f07b1f..292df986 100644 --- a/src/com/engine/organization/entity/postion/po/PostPO.java +++ b/src/com/engine/organization/entity/postion/po/PostPO.java @@ -22,10 +22,6 @@ public class PostPO { * 主键 */ private Long id; - /** - * 编号 - */ - private String postNo; /** * 名称 */ diff --git a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java index 6a36d9db..2934666f 100644 --- a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java @@ -27,7 +27,8 @@ import lombok.NoArgsConstructor; " t.forbidden_tag," + "t.is_used", fromSql = "from jcl_org_grade t inner join jcl_org_scheme a on t.scheme_id = a.id ", - orderby = "id desc", + orderby = "grade_no", + sortway = "asc", primarykey = "id", operates = { @OrganizationTableOperate(text = "编辑"), @@ -52,7 +53,7 @@ public class GradeTableVO { /** * 编号 */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "grade_no") + @OrganizationTableColumn(text = "编号", width = "20%", column = "grade_no", orderkey = "grade_no") private String gradeNo; /** * 名称 diff --git a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java index c4c4e0e9..93c1722c 100644 --- a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java +++ b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java @@ -30,7 +30,8 @@ import lombok.NoArgsConstructor; "t.create_time," + "t.update_time", fromSql = "FROM jcl_org_sequence t inner join jcl_org_scheme s on t.scheme_id = s.id ", - orderby = "id desc", + orderby = "sequence_no", + sortway = "asc", primarykey = "id", operates = { @OrganizationTableOperate(text = "编辑"), @@ -43,42 +44,42 @@ import lombok.NoArgsConstructor; ) public class SequenceTableVO { - /** - * 主键 - */ - @OrganizationTableColumn(column = "id", display = false) - private Long id; - /** - * 是否被引用 - */ - @OrganizationTableColumn(column = "isUsed", display = false) - private Integer isUsed; - /** - * 编号 - */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "sequence_no") - private String sequenceNo; - /** - * 名称 - */ - @OrganizationTableColumn(text = "名称", width = "20%", column = "sequence_name") - private String sequenceName; + /** + * 主键 + */ + @OrganizationTableColumn(column = "id", display = false) + private Long id; + /** + * 是否被引用 + */ + @OrganizationTableColumn(column = "isUsed", display = false) + private Integer isUsed; + /** + * 编号 + */ + @OrganizationTableColumn(text = "编号", width = "20%", column = "sequence_no", orderkey = "sequence_no") + private String sequenceNo; + /** + * 名称 + */ + @OrganizationTableColumn(text = "名称", width = "20%", column = "sequence_name") + private String sequenceName; - /** - * 描述说明 - */ - @OrganizationTableColumn(text = "描述说明", width = "20%", column = "description") - private String description; + /** + * 描述说明 + */ + @OrganizationTableColumn(text = "描述说明", width = "20%", column = "description") + private String description; - /** - * 等级方案 - */ - @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name") - private String schemeName; + /** + * 等级方案 + */ + @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name") + private String schemeName; - /** - * 禁用标记 - */ - @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") - private Integer forbiddenTag; + /** + * 禁用标记 + */ + @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") + private Integer forbiddenTag; } diff --git a/src/com/engine/organization/mapper/post/PostMapper.java b/src/com/engine/organization/mapper/post/PostMapper.java index 0ec48e85..db7ab1a0 100644 --- a/src/com/engine/organization/mapper/post/PostMapper.java +++ b/src/com/engine/organization/mapper/post/PostMapper.java @@ -18,15 +18,6 @@ import java.util.Map; * @Version V1.0 **/ public interface PostMapper { - - /** - * 根据No查询职务分类 - * - * @param postNo - * @return - */ - List listByNo(@Param("postNo") String postNo); - /** * 获取职务分类根据ID * diff --git a/src/com/engine/organization/mapper/post/PostMapper.xml b/src/com/engine/organization/mapper/post/PostMapper.xml index 3604960f..df766b4b 100644 --- a/src/com/engine/organization/mapper/post/PostMapper.xml +++ b/src/com/engine/organization/mapper/post/PostMapper.xml @@ -3,7 +3,6 @@ - @@ -22,7 +21,6 @@ t . id - , t.post_no , t.post_name , t.description , t.creator @@ -37,13 +35,6 @@ from jcl_org_post t where id = #{id} AND delete_type = 0 - - - select @@ -68,6 +75,11 @@ from JCL_ORG_JOBDT where delete_type = 0 + update jcl_org_level diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.java b/src/com/engine/organization/mapper/scheme/SchemeMapper.java index e3f6ec68..ea41da19 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.java +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.java @@ -1,10 +1,12 @@ package com.engine.organization.mapper.scheme; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.scheme.po.SchemePO; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; @@ -79,4 +81,10 @@ public interface SchemeMapper { * @param ids */ int deleteByIds(@Param("ids") Collection ids); + + /** + * 获取左侧树 + * @return + */ + ArrayList getTreeData(); } diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml index b43994d7..daff34ff 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml @@ -13,6 +13,11 @@ + + + + + t @@ -68,6 +73,11 @@ from JCL_ORG_JOB where delete_type = 0 + diff --git a/src/com/engine/organization/service/LevelService.java b/src/com/engine/organization/service/LevelService.java index dff80c24..4a8bffff 100644 --- a/src/com/engine/organization/service/LevelService.java +++ b/src/com/engine/organization/service/LevelService.java @@ -1,5 +1,6 @@ package com.engine.organization.service; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.scheme.param.LevelSearchParam; import java.util.Collection; @@ -78,4 +79,11 @@ public interface LevelService { */ Map getTabInfo(); + /** + * 获取左侧树 + * + * @return + */ + TreeData getTreeData(); + } diff --git a/src/com/engine/organization/service/SchemeService.java b/src/com/engine/organization/service/SchemeService.java index ced25c40..7d5aa550 100644 --- a/src/com/engine/organization/service/SchemeService.java +++ b/src/com/engine/organization/service/SchemeService.java @@ -1,8 +1,10 @@ package com.engine.organization.service; +import com.engine.organization.entity.fieldset.vo.TypeTreeVO; import com.engine.organization.entity.scheme.param.SchemeSearchParam; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -70,8 +72,16 @@ public interface SchemeService { /** * 获取列表页面按钮信息 + * * @return */ Map getTableBtn(); + /** + * 获取左侧树 + * + * @return + */ + List getTreeData(); + } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index c465c0cd..d2017f94 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -210,7 +210,7 @@ public class GradeServiceImpl extends Service implements GradeService { sqlWhere += " AND t.grade_name " + dbType.like(gradeName); } String schemeId = (String) params.get("schemeId"); - if (StringUtils.isNotBlank(schemeId)) { + if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId)) { sqlWhere += " AND t.scheme_id = '" + schemeId + "'"; } String viewCondition = (String) params.get("viewCondition"); diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index abbf4495..dfb576cb 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -8,6 +8,7 @@ import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.TopTab; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.scheme.dto.LevelDTO; import com.engine.organization.entity.scheme.param.LevelSearchParam; import com.engine.organization.entity.scheme.po.LevelPO; @@ -183,6 +184,12 @@ public class LevelServiceImpl extends Service implements LevelService { return apiDatas; } + @Override + public TreeData getTreeData() { + ArrayList treeDataList = getLevelMapper().getTreeData(); + return TreeData.builder().children(treeDataList).title("职等").key("-1").build(); + } + /** * 查询条件 * @@ -197,7 +204,7 @@ public class LevelServiceImpl extends Service implements LevelService { sqlWhere += " AND t.level_name " + dbType.like(levelName); } String schemeId = (String) params.get("schemeId"); - if (StringUtils.isNotBlank(schemeId)) { + if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId)) { sqlWhere += " AND t.scheme_id = '" + schemeId + "'"; } String viewCondition = (String) params.get("viewCondition"); diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index 1a0f7565..2f3c5bf1 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -125,11 +125,11 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { SearchConditionItem nameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postInfoName"); nameItem.setRules("required|string"); // 权限 - SearchConditionItem authorityItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 2, 50, "权限", "postInfoAuthority"); + SearchConditionItem authorityItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 50, "权限", "postInfoAuthority"); // 责任 - SearchConditionItem dutyItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 2, 50, "责任", "postInfoDuty"); + SearchConditionItem dutyItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 50, "责任", "postInfoDuty"); // 资格 - SearchConditionItem qualificationItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 2, 50, "资格", "postInfoQualification"); + SearchConditionItem qualificationItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 50, "资格", "postInfoQualification"); // 职务分类 SearchConditionItem postIdBrowser = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职务分类", "161", "postId", "postBrowser"); postIdBrowser.setRules("required|string"); @@ -172,7 +172,25 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getHasRight() { - return MenuBtn.getCommonBtnDatas(); + Map btnDatas = new HashMap<>(); + ArrayList topMenuList = new ArrayList<>(); + ArrayList rightMenuList = new ArrayList<>(); + // 新增 + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("addPlan").menuIcon("icon-coms-New-Flow").menuName("新增职务分类").type("BTN_AddPlan").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("editPlan").menuIcon("icon-coms-edit").menuName("修改职务分类").type("BTN_EditPlan").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("delPlan").menuIcon("icon-coms-Delete").menuName("删除职务分类").type("BTN_DelPlan").build()); + topMenuList.add(MenuBtn.topMenu_addNew()); + // 批量删除 + topMenuList.add(MenuBtn.topMenu_batchDelete()); + btnDatas.put("topMenu", topMenuList); + // 新增 + rightMenuList.add(MenuBtn.rightMenu_addNew()); + // 日志 + rightMenuList.add(MenuBtn.rightMenu_btnLog()); + // 显示列定制 + rightMenuList.add(MenuBtn.rightMenu_btnColumn()); + btnDatas.put("rightMenu", rightMenuList); + return btnDatas; } diff --git a/src/com/engine/organization/service/impl/PostServiceImpl.java b/src/com/engine/organization/service/impl/PostServiceImpl.java index 9bb6f26a..4aa59117 100644 --- a/src/com/engine/organization/service/impl/PostServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostServiceImpl.java @@ -34,8 +34,8 @@ public class PostServiceImpl extends Service implements PostService { @Override public int savePost(PostPO postPO) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - List list = getPostMapper().listByNo(Util.null2String(postPO.getPostNo())); - OrganizationAssert.isEmpty(list, "编号不允许重复"); + // List list = getPostMapper().listByNo(Util.null2String(postPO.getPostNo())); + // OrganizationAssert.isEmpty(list, "编号不允许重复"); return getPostMapper().insertIgnoreNull(PostDTO.convertPO(postPO, user.getUID())); } @@ -60,8 +60,6 @@ public class PostServiceImpl extends Service implements PostService { List addGroups = new ArrayList<>(); SearchConditionItem postNameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postName"); postNameItem.setRules("required|string"); - SearchConditionItem postNoItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "postNo"); - postNoItem.setRules("required|string"); SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description"); // 编辑状态下赋值操作 @@ -71,12 +69,10 @@ public class PostServiceImpl extends Service implements PostService { OrganizationAssert.notNull(postPO, "选择的数据不存在，或数据已删除"); postNameItem.setValue(postPO.getPostName()); - postNoItem.setValue(postPO.getPostNo()); descriptionItem.setValue(postPO.getDescription()); } - selectItems.add(postNoItem); selectItems.add(postNameItem); selectItems.add(descriptionItem); addGroups.add(new SearchConditionGroup("基本信息", true, selectItems)); @@ -87,7 +83,7 @@ public class PostServiceImpl extends Service implements PostService { @Override public TreeData getTreeData() { ArrayList treeDataList = getPostMapper().getTreeData(); - return TreeData.builder().children(treeDataList).title("全部类型").key("-1").build(); + return TreeData.builder().children(treeDataList).title("职务分类").key("-1").build(); } diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 6ad771c1..1d312b1b 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -5,6 +5,8 @@ import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; +import com.engine.organization.entity.TreeData; +import com.engine.organization.entity.fieldset.vo.TypeTreeVO; import com.engine.organization.entity.scheme.dto.SchemeDTO; import com.engine.organization.entity.scheme.param.SchemeSearchParam; import com.engine.organization.entity.scheme.po.SchemePO; @@ -20,6 +22,7 @@ import weaver.general.StringUtil; import weaver.general.Util; import java.util.*; +import java.util.stream.Collectors; /** * @Author dxfeng @@ -151,6 +154,26 @@ public class SchemeServiceImpl extends Service implements SchemeService { return MenuBtn.getCommonBtnDatas(); } + @Override + public List getTreeData() { + ArrayList treeDataList = getSchemeMapper().getTreeData(); + TypeTreeVO build = TypeTreeVO.builder() + .childs(treeDataList.stream().map(e -> + TypeTreeVO.builder() + .domid(e.getKey()) + .key(Long.parseLong(e.getKey())) + .name(e.getTitle()) + .build()).collect(Collectors.toList())) + .haschild(true) + .domid("-1") + .key(-1L) + .name("全部方案").build(); + List typeTreeVOS = new ArrayList<>(); + typeTreeVOS.add(build); + return typeTreeVOS; + } + + /** * 查询条件 * diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index 01aae2e1..fefd3d20 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -78,6 +78,11 @@ public class SequenceServiceImpl extends Service implements SequenceService { public int updateSequence(SequenceSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); SequencePO sequencePO = SequenceDTO.convertParamToPO(param, (long) user.getUID()); + String oldSequenceNo = getSequenceMapper().getSequenceByID(sequencePO.getId()).getSequenceNo(); + if (!oldSequenceNo.equals(sequencePO.getSequenceNo())) { + List list = getSequenceMapper().listByNo(Util.null2String(sequencePO.getSequenceNo())); + OrganizationAssert.isEmpty(list, "编号不允许重复"); + } return getSequenceMapper().updateSequence(sequencePO); } @@ -142,7 +147,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { browserBean.setReplaceDatas(maps); browserItem.setBrowserConditionParam(browserBean); // 编辑状态下,编号只读 - sequenceNoCondition.setViewAttr(1); + // sequenceNoCondition.setViewAttr(1); } selectItems.add(sequenceNoCondition); diff --git a/src/com/engine/organization/web/LevelController.java b/src/com/engine/organization/web/LevelController.java index fad3db68..2f9157aa 100644 --- a/src/com/engine/organization/web/LevelController.java +++ b/src/com/engine/organization/web/LevelController.java @@ -202,4 +202,16 @@ public class LevelController { return ReturnResult.exceptionHandle(e.getMessage()); } } + + @GET + @Path("/getTreeData") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getLevelWrapper(user).getTreeData()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } } diff --git a/src/com/engine/organization/web/SchemeController.java b/src/com/engine/organization/web/SchemeController.java index d6f815a0..b8c23fd2 100644 --- a/src/com/engine/organization/web/SchemeController.java +++ b/src/com/engine/organization/web/SchemeController.java @@ -177,5 +177,17 @@ public class SchemeController { } } + @GET + @Path("/getTreeData") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getSchemeWrapper(user).getTreeData()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + } diff --git a/src/com/engine/organization/wrapper/LevelWrapper.java b/src/com/engine/organization/wrapper/LevelWrapper.java index 20c733e0..a3430d6b 100644 --- a/src/com/engine/organization/wrapper/LevelWrapper.java +++ b/src/com/engine/organization/wrapper/LevelWrapper.java @@ -2,6 +2,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.scheme.param.LevelSearchParam; import com.engine.organization.service.LevelService; import com.engine.organization.service.impl.LevelServiceImpl; @@ -108,4 +109,8 @@ public class LevelWrapper extends Service { public Map getTabInfo() { return getLevelService(user).getTabInfo(); } + + public TreeData getTreeData() { + return getLevelService(user).getTreeData(); + } } diff --git a/src/com/engine/organization/wrapper/SchemeWrapper.java b/src/com/engine/organization/wrapper/SchemeWrapper.java index fbb0d6ab..2f8727ad 100644 --- a/src/com/engine/organization/wrapper/SchemeWrapper.java +++ b/src/com/engine/organization/wrapper/SchemeWrapper.java @@ -2,6 +2,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.organization.entity.fieldset.vo.TypeTreeVO; import com.engine.organization.entity.scheme.param.SchemeSearchParam; import com.engine.organization.service.SchemeService; import com.engine.organization.service.impl.SchemeServiceImpl; @@ -9,6 +10,7 @@ import org.apache.ibatis.annotations.Param; import weaver.hrm.User; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -74,6 +76,7 @@ public class SchemeWrapper extends Service { /** * 获取搜索条件 + * * @param params * @return */ @@ -84,6 +87,7 @@ public class SchemeWrapper extends Service { /** * 获取新增表单 + * * @param params * @return */ @@ -93,9 +97,14 @@ public class SchemeWrapper extends Service { /** * 获取列表页面按钮信息 + * * @return */ public Map getTableBtn() { return getSchemeService(user).getTableBtn(); } + + public List getTreeData() { + return getSchemeService(user).getTreeData(); + } } From eeb8c47451199ff503a11e39782f4851585098bc Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 23 Jun 2022 09:14:19 +0800 Subject: [PATCH 16/27] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E4=BA=8B?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 59 ++++++++++++++++ docs/表结构SQL/Oracle.sql | 1 + docs/表结构SQL/SqlServer.sql | 1 + .../organization/annotation/TableTitle.java | 2 + .../entity/company/bo/CompBO.java | 1 + .../entity/company/dto/CompListDTO.java | 15 ++-- .../entity/company/po/CompPO.java | 5 ++ .../department/dto/DepartmentListDTO.java | 22 ++---- .../entity/postion/vo/PostInfoTableVO.java | 5 +- .../organization/mapper/comp/CompMapper.java | 6 ++ .../organization/mapper/comp/CompMapper.xml | 13 +++- .../mapper/department/DepartmentMapper.xml | 2 +- .../service/impl/CompServiceImpl.java | 63 +++++++++++++++-- .../service/impl/DepartmentServiceImpl.java | 70 ++++++++++++++++--- .../service/impl/JobServiceImpl.java | 16 +++-- .../service/impl/PostInfoServiceImpl.java | 7 +- .../engine/organization/util/page/Column.java | 5 +- .../organization/util/page/PageInfo.java | 6 +- 18 files changed, 247 insertions(+), 52 deletions(-) diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index cf55e226..e4d88dd4 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -105,6 +105,7 @@ CREATE TABLE JCL_ORG_COMP ( comp_principal int null, description text NULL, forbidden_tag int NULL, + show_order int NULL, is_used int null, creator int null, delete_type int null, @@ -294,6 +295,64 @@ CREATE TABLE JCL_ORG_JOBEXT_DT1 ( CONSTRAINT JCL_ORG_JOBEXT_DT1_PK PRIMARY KEY (id) ); +-- JCL_ORG_HRMRESOURCE +CREATE TABLE JCL_ORG_HRMRESOURCE ( + id int auto_increment NOT NULL, + work_code varchar(60) null, + login_id varchar(60) null, + last_name varchar(60) null, + sex int null, + account_type int null, + belong_to int null, + company_id int null, + department_id int null, + job_activity int null, + job_title int null, + job_call int null, + job_level int null, + job_group_id int null, + job_activity_desc varchar(200) null, + status int null, + system_language int null, + resource_image_id varchar(1000) null, + messager_url varchar(1000) null, + location_id int null, + manager_id int null, + assistant_id int null, + mobile varchar(60) null, + telephone varchar(60) null, + mobile_call varchar(60) null, + fax varchar(60) null, + email varchar(60) null, + workroom varchar(60) null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_ORG_HRMRESOURCE_PK PRIMARY KEY (id) +); + +-- JCL_ORG_HRMRESOURCEEXT +CREATE TABLE JCL_ORG_HRMRESOURCEEXT ( + id int NOT NULL, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_ORG_HRMRESOURCEEXT_PK PRIMARY KEY (id) +); + +-- JCL_ORG_HRMRESOURCEEXT_DT1 +CREATE TABLE JCL_ORG_HRMRESOURCEEXT_DT1 ( + id int auto_increment NOT NULL, + mainid int NULL, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_ORG_HRMRESOURCEEXT_DT1_PK PRIMARY KEY (id) +); + -- JCL_ORG_STAFFPLAN CREATE TABLE JCL_ORG_STAFFPLAN ( diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 1be6474e..425f4246 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -107,6 +107,7 @@ CREATE TABLE JCL_ORG_COMP ( COMP_PRINCIPAL NUMBER NULL, DESCRIPTION NVARCHAR2(1000) NULL, FORBIDDEN_TAG NUMBER NULL, + SHOW_ORDER NUMBER NULL, IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index c15b57bc..66df9dc9 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -105,6 +105,7 @@ CREATE TABLE JCL_ORG_COMP ( comp_principal int null, description text COLLATE Chinese_PRC_CI_AS NULL, forbidden_tag int NULL, + show_order int null, is_used int null, creator int null, delete_type int null, diff --git a/src/com/engine/organization/annotation/TableTitle.java b/src/com/engine/organization/annotation/TableTitle.java index 22893a1a..aff2bf9a 100644 --- a/src/com/engine/organization/annotation/TableTitle.java +++ b/src/com/engine/organization/annotation/TableTitle.java @@ -11,4 +11,6 @@ public @interface TableTitle { String dataIndex(); String key(); boolean display() default true; + String width() default ""; + boolean sorter() default false; } diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index 38ce339b..c43b684e 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -38,6 +38,7 @@ public class CompBO { .orgCode(e.getOrgCode()) .industry(new SectorInfoComInfo().getSectorInfoname(e.getIndustry() + "")) .compPrincipal(getUserNameById(e.getCompPrincipal() + "")) + .showOrder(e.getShowOrder()) .forbiddenTag(e.getForbiddenTag()) .build()).collect(Collectors.toList()); Map> collects = dtoList.stream().filter(item -> null != item.getParentCompany() && 0 != item.getParentCompany()).collect(Collectors.groupingBy(CompListDTO::getParentCompany)); diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java index 5e13182b..43b861bc 100644 --- a/src/com/engine/organization/entity/company/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -1,7 +1,6 @@ package com.engine.organization.entity.company.dto; import com.engine.organization.annotation.OrganizationTable; -import com.engine.organization.annotation.OrganizationTableOperate; import com.engine.organization.annotation.TableTitle; import lombok.AllArgsConstructor; import lombok.Builder; @@ -20,12 +19,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -@OrganizationTable(pageId = "2c66b3a4-d4f8-11ec-9774-00ffcbed7508", - operates = { - @OrganizationTableOperate(text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除"), - @OrganizationTableOperate(index = "2", text = "查看部门") - }) +@OrganizationTable(pageId = "2c66b3a4-d4f8-11ec-9774-00ffcbed7508") public class CompListDTO { /** * 主键id @@ -44,7 +38,7 @@ public class CompListDTO { /** * 编号 */ - @TableTitle(title = "编号", dataIndex = "compNo", key = "compNo") + @TableTitle(title = "编号", dataIndex = "compNo", key = "compNo",sorter = true) private String compNo; /** @@ -56,7 +50,7 @@ public class CompListDTO { /** * 上级公司 */ - @TableTitle(title = "上级公司", dataIndex = "parentCompName", key = "parentCompName") + @TableTitle(title = "上级分部", dataIndex = "parentCompName", key = "parentCompName") private String parentCompName; private Long parentCompany; @@ -79,6 +73,9 @@ public class CompListDTO { @TableTitle(title = "负责人", dataIndex = "compPrincipal", key = "compPrincipal") private String compPrincipal; + @TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder") + private Integer showOrder; + /** * 禁用标记 */ diff --git a/src/com/engine/organization/entity/company/po/CompPO.java b/src/com/engine/organization/entity/company/po/CompPO.java index f23ab7cb..c4c61fce 100644 --- a/src/com/engine/organization/entity/company/po/CompPO.java +++ b/src/com/engine/organization/entity/company/po/CompPO.java @@ -69,6 +69,11 @@ public class CompPO { */ private Integer forbiddenTag; + /** + * 显示顺序 + */ + private Integer showOrder; + private Long creator; private int deleteType; private Date createTime; diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index 301470cf..7eb9fd9d 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -2,7 +2,6 @@ package com.engine.organization.entity.department.dto; import com.cloudstore.eccom.pc.table.WeaTableType; import com.engine.organization.annotation.OrganizationTable; -import com.engine.organization.annotation.OrganizationTableOperate; import com.engine.organization.annotation.TableTitle; import lombok.AllArgsConstructor; import lombok.Builder; @@ -22,15 +21,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @OrganizationTable(pageId = "96f2bb0d-da73-11ec-a0da-00ffcbed7508", - tableType = WeaTableType.NONE, - operates = { - @OrganizationTableOperate(text = "编辑"), - @OrganizationTableOperate(index = "1", text = "删除"), - @OrganizationTableOperate(index = "2", text = "合并"), - @OrganizationTableOperate(index = "3", text = "转移"), - @OrganizationTableOperate(index = "4", text = "联查岗位"), - @OrganizationTableOperate(index = "4", text = "联查人员") - }) + tableType = WeaTableType.NONE) public class DepartmentListDTO { private Long id; @@ -38,11 +29,6 @@ public class DepartmentListDTO { * 是否被引用 */ private Integer isUsed; - /** - * 编号 - */ - @TableTitle(title = "编号", dataIndex = "deptNo", key = "deptNo") - private String deptNo; /** * 名称 @@ -50,6 +36,12 @@ public class DepartmentListDTO { @TableTitle(title = "名称", dataIndex = "deptName", key = "deptName") private String deptName; + /** + * 编号 + */ + @TableTitle(title = "编号", dataIndex = "deptNo", key = "deptNo") + private String deptNo; + /** * 简称 */ diff --git a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java index b84dc5f3..c89837c7 100644 --- a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java +++ b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java @@ -29,7 +29,8 @@ import lombok.NoArgsConstructor; " t.description," + " t.forbidden_tag", fromSql = " from jcl_org_post_info t inner join jcl_org_post a on t.post_id = a.id ", - orderby = "id desc", + orderby = "post_info_no", + sortway = "asc", primarykey = "id", operates = { @OrganizationTableOperate(index = "0", text = "编辑"), @@ -45,7 +46,7 @@ public class PostInfoTableVO { /** * 编号 */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "post_info_no") + @OrganizationTableColumn(text = "编号", width = "20%", column = "post_info_no", orderkey = "post_info_no") private String postInfoNo; /** * 名称 diff --git a/src/com/engine/organization/mapper/comp/CompMapper.java b/src/com/engine/organization/mapper/comp/CompMapper.java index 33477e2a..29bc23b3 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.java +++ b/src/com/engine/organization/mapper/comp/CompMapper.java @@ -133,4 +133,10 @@ public interface CompMapper { * @param ids */ int deleteByIds(@Param("ids") Collection ids); + + /** + * 获取最大排序 + * @return + */ + int getMaxShowOrder(); } diff --git a/src/com/engine/organization/mapper/comp/CompMapper.xml b/src/com/engine/organization/mapper/comp/CompMapper.xml index 042a8b3f..124ed2cc 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.xml +++ b/src/com/engine/organization/mapper/comp/CompMapper.xml @@ -12,6 +12,7 @@ + @@ -32,6 +33,7 @@ , t.comp_principal , t.description , t.forbidden_tag + , t.show_order , t.creator , t.delete_type , t.create_time @@ -91,6 +93,9 @@ description, forbidden_tag, + + show_order, + @@ -130,6 +135,7 @@ #{description}, 0, + #{showOrder}, @@ -138,7 +144,7 @@ FROM jcl_org_comp t - WHERE t.delete_type = 0 + WHERE t.delete_type = 0 order by show_order + update jcl_org_comp @@ -282,6 +292,7 @@ industry=#{industry}, comp_principal=#{compPrincipal}, description=#{description}, + show_order=#{showOrder}, WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index 2912552e..58d26b52 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -103,7 +103,7 @@ SELECT FROM jcl_org_dept t - WHERE t.delete_type = 0 + WHERE t.delete_type = 0 order by show_order + listExt(@Param("tableName") String tableName, @Param("fields") String fields, @Param("id") long id); + Map listExt(ExtendInfoParams params); /** * 判断当前数据是否存在 * - * @param tableName - * @param id + * @param params * @return */ - int countExtById(@Param("tableName") String tableName, @Param("id") long id); + int countExtById(ExtendInfoParams params); /** * 插入主表拓展表 * - * @param map + * @param params * @return */ - int insertExt(@Param("tableName") String tableName, @Param("map") Map map); + int insertExt(ExtendInfoParams params); /** * 更新主表拓展表 * - * @param map + * @param params * @return */ - int updateExt(@Param("tableName") String tableName, @Param("id") long id, @Param("map") Map map); + int updateExt(ExtendInfoParams params); } diff --git a/src/com/engine/organization/mapper/extend/ExtMapper.xml b/src/com/engine/organization/mapper/extend/ExtMapper.xml index 612c228b..05c24278 100644 --- a/src/com/engine/organization/mapper/extend/ExtMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtMapper.xml @@ -2,36 +2,38 @@ - - + insert into ${tableName} ( - + ${key} ) values ( - + #{value} ) - + update ${tableName} set - + ${key} = #{value} where id = #{id} - select ${fields} from ${tableName} where delete_type = 0 and id = #{id} - select count(1) from ${tableName} where delete_type = 0 diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index e6e6627b..0b813eab 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -123,4 +123,10 @@ public interface JobMapper { * @return */ List listUsedId(); + + /** + * 获取最大排序 + * @return + */ + int getMaxShowOrder(); } diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 030de2cc..115d33f6 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -330,6 +330,10 @@ and t.forbidden_tag = #{forbiddenTag} + diff --git a/src/com/engine/organization/service/CompService.java b/src/com/engine/organization/service/CompService.java index c6f16a79..619bef50 100644 --- a/src/com/engine/organization/service/CompService.java +++ b/src/com/engine/organization/service/CompService.java @@ -27,7 +27,7 @@ public interface CompService { * @param params * @return */ - int saveBaseComp(Map params); + Long saveBaseComp(Map params); /** * 更新禁用标记 @@ -43,7 +43,7 @@ public interface CompService { * @param params * @return */ - int updateComp(Map params); + Long updateComp(Map params); /** diff --git a/src/com/engine/organization/service/DepartmentService.java b/src/com/engine/organization/service/DepartmentService.java index 176e31ae..a3d382e0 100644 --- a/src/com/engine/organization/service/DepartmentService.java +++ b/src/com/engine/organization/service/DepartmentService.java @@ -58,7 +58,7 @@ public interface DepartmentService { * @param params * @return */ - int saveBaseForm(Map params); + Long saveBaseForm(Map params); /** * 更新禁用标记 @@ -74,7 +74,7 @@ public interface DepartmentService { * @param params * @return */ - int updateForm(Map params); + Long updateForm(Map params); /** diff --git a/src/com/engine/organization/service/ExtService.java b/src/com/engine/organization/service/ExtService.java index af0e8484..172414da 100644 --- a/src/com/engine/organization/service/ExtService.java +++ b/src/com/engine/organization/service/ExtService.java @@ -73,7 +73,7 @@ public interface ExtService { * @param id * @return */ - int updateExtForm(User user, String extendType, String tableName, Map params, String groupId, Long id); + Long updateExtForm(User user, String extendType, String tableName, Map params, String groupId, Long id); /** * 更新明细表 diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java index 9afee6ed..5c0193b3 100644 --- a/src/com/engine/organization/service/HrmResourceService.java +++ b/src/com/engine/organization/service/HrmResourceService.java @@ -41,7 +41,7 @@ public interface HrmResourceService { * @param params * @return */ - int saveBaseForm(Map params); + Long saveBaseForm(Map params); /** * 获取基本信息表单 diff --git a/src/com/engine/organization/service/JobService.java b/src/com/engine/organization/service/JobService.java index 57ff8c5d..f342ee69 100644 --- a/src/com/engine/organization/service/JobService.java +++ b/src/com/engine/organization/service/JobService.java @@ -63,7 +63,7 @@ public interface JobService { * @param params * @return */ - int saveBaseForm(Map params); + Long saveBaseForm(Map params); /** * 更新主表、拓展表、明细表 @@ -71,7 +71,7 @@ public interface JobService { * @param params * @return */ - int updateForm(Map params); + Long updateForm(Map params); /** * 复制岗位到指定部门 diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 5157e65f..c4aae189 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -135,7 +135,7 @@ public class CompServiceImpl extends Service implements CompService { } @Override - public int saveBaseComp(Map params) { + public Long saveBaseComp(Map params) { HasRightUtil.hasRight(user, RIGHT_NAME, false); String compNo = (String) params.get("comp_no"); // 判断是否开启自动编号 @@ -156,7 +156,7 @@ public class CompServiceImpl extends Service implements CompService { } @Override - public int updateComp(Map params) { + public Long updateComp(Map params) { HasRightUtil.hasRight(user, RIGHT_NAME, false); CompSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), CompSearchParam.class); String groupId = (String) params.get("viewCondition"); @@ -169,15 +169,14 @@ public class CompServiceImpl extends Service implements CompService { compNo = repeatDetermine(compNo); params.put("comp_no", compNo); } - int updateCount = 0; // 更新主表数据 - updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, "", searchParam.getId()); + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, "", searchParam.getId()); // 更新主表拓展表 - updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMPEXT, params, groupId, searchParam.getId()); + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMPEXT, params, groupId, searchParam.getId()); //更新明细表 getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_COMPEXT_DT1, params, searchParam.getId()); - return updateCount; + return searchParam.getId(); } @Override diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index f7c77bb5..5266498b 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -188,14 +188,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } @Override - public int saveBaseForm(Map params) { + public Long saveBaseForm(Map params) { HasRightUtil.hasRight(user, RIGHT_NAME, false); String deptNo = (String) params.get("dept_no"); // 判断是否开启自动编号 deptNo = repeatDetermine(deptNo); params.put("dept_no", deptNo); if (StringUtils.isBlank((String) params.get("show_order"))) { - int maxShowOrder = getCompMapper().getMaxShowOrder(); + int maxShowOrder = getDepartmentMapper().getMaxShowOrder(); params.put("show_order", maxShowOrder + 1); } @@ -210,7 +210,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } @Override - public int updateForm(Map params) { + public Long updateForm(Map params) { HasRightUtil.hasRight(user, RIGHT_NAME, false); DeptSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), DeptSearchParam.class); String groupId = (String) params.get("viewCondition"); @@ -224,15 +224,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService deptNo = repeatDetermine(deptNo); params.put("dept_no", deptNo); } - int updateCount = 0; // 更新主表数据 - updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPT, params, "", searchParam.getId()); + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPT, params, "", searchParam.getId()); // 更新主表拓展表 - updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPTEXT, params, groupId, searchParam.getId()); + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPTEXT, params, groupId, searchParam.getId()); //更新明细表 getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_DEPTEXT_DT1, params, searchParam.getId()); - return updateCount; + return searchParam.getId(); } @Override diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index fa26643e..bcf9bd72 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -6,6 +6,7 @@ import com.engine.organization.entity.TopTab; import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.extend.ExtendInfoOperateType; import com.engine.organization.entity.extend.bo.ExtendInfoBO; +import com.engine.organization.entity.extend.param.ExtendInfoParams; import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; import com.engine.organization.entity.extend.po.ExtendTitlePO; @@ -71,7 +72,8 @@ public class ExtServiceImpl extends Service implements ExtService { if (StringUtils.isEmpty(fields)) { return conditionItems; } - Map compExtMap = getExtMapper().listExt(tableName, fields, id); + ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName(tableName).fields(fields).params(null).id(id).build(); + Map compExtMap = getExtMapper().listExt(infoParams); List readOnlyFieldList = Arrays.asList(readOnlyFields); // 组装拓展页内容 for (ExtendInfoPO extendInfoPO : infoPOList) { @@ -184,8 +186,7 @@ public class ExtServiceImpl extends Service implements ExtService { } @Override - public int updateExtForm(User user, String extendType, String tableName, Map params, String groupId, Long id) { - int updateBaseComp; + public Long updateExtForm(User user, String extendType, String tableName, Map params, String groupId, Long id) { List extInfoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ""); Map map = new HashMap<>(); // 遍历Map @@ -209,20 +210,20 @@ public class ExtServiceImpl extends Service implements ExtService { map.put(key, value); } } - + ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName(tableName).params(map).id(id).build(); if (null != id) { // 判断更新还是插入 - int count = getExtMapper().countExtById(tableName, id); + int count = getExtMapper().countExtById(infoParams); if (count > 0) { map.put("update_time", new Date()); - updateBaseComp = getExtMapper().updateExt(tableName, id, map); + getExtMapper().updateExt(infoParams); } else { map.put("creator", user.getUID()); map.put("delete_type", 0); map.put("create_time", new Date()); map.put("update_time", new Date()); map.put("id", id); - updateBaseComp = getExtMapper().insertExt(tableName, map); + getExtMapper().insertExt(infoParams); } } else { if (!tableName.equals("JCL_ORG_HRMRESOURCE")) { @@ -232,9 +233,9 @@ public class ExtServiceImpl extends Service implements ExtService { map.put("delete_type", 0); map.put("create_time", new Date()); map.put("update_time", new Date()); - updateBaseComp = getExtMapper().insertExt(tableName, map); + getExtMapper().insertExt(infoParams); } - return updateBaseComp; + return infoParams.getId(); } @Override diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index e1cbc1ff..c8dc3131 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -139,7 +139,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic } @Override - public int saveBaseForm(Map params) { + public Long saveBaseForm(Map params) { return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_HRM, params, "", null); } diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 4daff76e..ec12c0c9 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -329,37 +329,38 @@ public class JobServiceImpl extends Service implements JobService { } @Override - public int saveBaseForm(Map params) { + public Long saveBaseForm(Map params) { HasRightUtil.hasRight(user, RIGHT_NAME, false); String jobNo = (String) params.get("job_no"); // 判断是否开启自动编号 jobNo = repeatDetermine(jobNo); params.put("job_no", jobNo); - JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class); - JobPO jobPO = JobBO.convertParamsToPO(searchParam, user.getUID()); - jobPO.setIsKey(null == jobPO.getIsKey() ? 0 : jobPO.getIsKey()); - int insertCount = getJobMapper().insertIgnoreNull(jobPO); - params.put("is_key", jobPO.getIsKey()); - DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(jobPO.getParentDept()); + + params.put("is_key", null == searchParam.getIsKey() ? 0 : searchParam.getIsKey()); + DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept()); params.put("parent_comp", departmentPO.getParentComp()); + if (StringUtils.isBlank(params.get("show_order").toString())) { + int maxShowOrder = getJobMapper().getMaxShowOrder(); + params.put("show_order", maxShowOrder + 1); + } - getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", jobPO.getId()); - if (null != jobPO.getSchemeId()) { + Long jobId = getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", null); + if (null != searchParam.getSchemeId()) { // 插入明细表信息 // 根据等级方案查询职等、职级 - List gradePOS = MapperProxyFactory.getProxy(GradeMapper.class).listGradesBySchemeId(jobPO.getSchemeId()); + List gradePOS = MapperProxyFactory.getProxy(GradeMapper.class).listGradesBySchemeId(searchParam.getSchemeId()); for (GradePO gradePO : gradePOS) { List> maps = MapperProxyFactory.getProxy(LevelMapper.class).listLevelsByIds(DeleteParam.builder().ids(gradePO.getLevelId()).build().getIds()); String levelNames = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); - insertCount += getJobDTMapper().insertIgnoreNull(JobDTPO.builder().levelId(gradePO.getLevelId()).gradeId(gradePO.getId() + "").levelIdspan(levelNames).gradeIdspan(gradePO.getGradeName()).mainId(jobPO.getId()).creator((long) user.getUID()).deleteType(0).createTime(new Date()).updateTime(new Date()).build()); + getJobDTMapper().insertIgnoreNull(JobDTPO.builder().levelId(gradePO.getLevelId()).gradeId(gradePO.getId() + "").levelIdspan(levelNames).gradeIdspan(gradePO.getGradeName()).mainId(jobId).creator((long) user.getUID()).deleteType(0).createTime(new Date()).updateTime(new Date()).build()); } } - return insertCount; + return jobId; } @Override - public int updateForm(Map params) { + public Long updateForm(Map params) { HasRightUtil.hasRight(user, RIGHT_NAME, false); JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class); String groupId = (String) params.get("viewCondition"); @@ -374,15 +375,14 @@ public class JobServiceImpl extends Service implements JobService { params.put("job_no", jobNo); } - int updateCount = 0; // 更新主表数据 params.put("is_key", searchParam.getIsKey()); DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(searchParam.getParentDept()); params.put("parent_comp", departmentPO.getParentComp()); - updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", searchParam.getId()); + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", searchParam.getId()); // 更新主表拓展表 - updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOBEXT, params, groupId, searchParam.getId()); + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOBEXT, params, groupId, searchParam.getId()); // 更新明细表 getJobDTMapper().deleteByIds(searchParam.getId()); int rowNum = Util.getIntValue((String) params.get("rownum")); @@ -394,7 +394,7 @@ public class JobServiceImpl extends Service implements JobService { getJobDTMapper().insertIgnoreNull(JobDTPO.builder().levelId(levelId).gradeId(gradeId).levelIdspan(levelIdspan).gradeIdspan(gradeIdspan).mainId(searchParam.getId()).creator((long) user.getUID()).deleteType(0).createTime(new Date()).updateTime(new Date()).build()); } getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_JOBEXT_DT1, params, searchParam.getId()); - return updateCount; + return searchParam.getId(); } @Override @@ -554,20 +554,6 @@ public class JobServiceImpl extends Service implements JobService { && null == jobPO.getForbiddenTag(); } - /** - * 获取待删除数据的子级元素 - * - * @param ids - * @param deleteIds - */ - private void getChildIds(Collection ids, Collection deleteIds) { - for (Long id : ids) { - deleteIds.add(id); - Collection childIds = getJobMapper().getJobsByPid(id).stream().map(JobPO::getId).collect(Collectors.toList()); - getChildIds(childIds, deleteIds); - } - } - /** * 判断编号是否重复 * diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 3443f930..959095cb 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -127,8 +127,10 @@ public class StaffServiceImpl extends Service implements StaffService { List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); - // 方案 - SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "方案", "161", "planId", "staffPlanBrowser"); + //// 方案 + //SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "方案11", "161", "planId", "staffPlanBrowser"); + //planIdItem.setHide(true); + //planIdItem.setDisplay("none"); // 分部 SearchConditionItem compIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "分部", "161", "compId", "compBrowser"); // 部门 @@ -155,7 +157,7 @@ public class StaffServiceImpl extends Service implements StaffService { // 说明 SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description"); - conditionItems.add(planIdItem); + //conditionItems.add(planIdItem); conditionItems.add(compIdItem); conditionItems.add(deptIdItem); conditionItems.add(jobIdItem); @@ -178,7 +180,7 @@ public class StaffServiceImpl extends Service implements StaffService { List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); // 方案 - SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 4, false, "方案", "161", "planId", "staffPlanBrowser"); + SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "方案", "161", "planId", "staffPlanBrowser"); planIdItem.setRules("required|string"); // 分部 SearchConditionItem compIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "分部", "161", "compId", "compBrowser"); @@ -268,7 +270,7 @@ public class StaffServiceImpl extends Service implements StaffService { List addGroups = new ArrayList<>(); List selectItems = new ArrayList<>(); // 方案 - SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 3, 3, false, "编制方案", "161", "planId", "staffPlanBrowser"); + SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 3, 2, false, "编制方案", "161", "planId", "staffPlanBrowser"); planIdItem.setRules("required|string"); planIdItem.setHelpfulTip("请选择编制方案后查看数据"); planIdItem.setLabelcol(2); diff --git a/src/com/engine/organization/wrapper/CompWrapper.java b/src/com/engine/organization/wrapper/CompWrapper.java index 6363ee2b..0d69ea70 100644 --- a/src/com/engine/organization/wrapper/CompWrapper.java +++ b/src/com/engine/organization/wrapper/CompWrapper.java @@ -38,7 +38,7 @@ public class CompWrapper extends Service { * @param params * @return */ - public int saveBaseComp(Map params) { + public Long saveBaseComp(Map params) { return getCompService(user).saveBaseComp(params); } @@ -57,7 +57,7 @@ public class CompWrapper extends Service { * @param params * @return */ - public int updateComp(Map params) { + public Long updateComp(Map params) { return getCompService(user).updateComp(params); } diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java index 197e9f1a..0a6cb835 100644 --- a/src/com/engine/organization/wrapper/DepartmentWrapper.java +++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java @@ -79,7 +79,7 @@ public class DepartmentWrapper extends Service { * @param params * @return */ - public int saveBaseForm(Map params) { + public Long saveBaseForm(Map params) { return getDepartmentService(user).saveBaseForm(params); } @@ -99,7 +99,7 @@ public class DepartmentWrapper extends Service { * @param params * @return */ - public int updateForm(Map params) { + public Long updateForm(Map params) { return getDepartmentService(user).updateForm(params); } diff --git a/src/com/engine/organization/wrapper/HrmResourceWrapper.java b/src/com/engine/organization/wrapper/HrmResourceWrapper.java index 938e8344..fa3dace7 100644 --- a/src/com/engine/organization/wrapper/HrmResourceWrapper.java +++ b/src/com/engine/organization/wrapper/HrmResourceWrapper.java @@ -33,7 +33,7 @@ public class HrmResourceWrapper extends Service { return getHrmResourceService(user).getSaveForm(); } - public int saveBaseForm(Map params) { + public Long saveBaseForm(Map params) { return getHrmResourceService(user).saveBaseForm(params); } diff --git a/src/com/engine/organization/wrapper/JobWrapper.java b/src/com/engine/organization/wrapper/JobWrapper.java index 9eab4a7c..95916f71 100644 --- a/src/com/engine/organization/wrapper/JobWrapper.java +++ b/src/com/engine/organization/wrapper/JobWrapper.java @@ -89,7 +89,7 @@ public class JobWrapper extends Service { * @param params * @return */ - public int saveBaseForm(Map params) { + public Long saveBaseForm(Map params) { return getJobService(user).saveBaseForm(params); } @@ -99,7 +99,7 @@ public class JobWrapper extends Service { * @param params * @return */ - public int updateForm(Map params) { + public Long updateForm(Map params) { return getJobService(user).updateForm(params); } From 15131186de99416042e38f25c0f2b21656851bc8 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 23 Jun 2022 18:49:47 +0800 Subject: [PATCH 22/27] =?UTF-8?q?=E5=88=86=E9=83=A8=E3=80=81=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E3=80=81=E5=B2=97=E4=BD=8D=E5=88=97=E8=A1=A8=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/common/BaseQueryParam.java | 5 + .../entity/company/param/CompSearchParam.java | 2 +- .../organization/mapper/comp/CompMapper.java | 7 +- .../organization/mapper/comp/CompMapper.xml | 70 +++++----- .../mapper/department/DepartmentMapper.java | 5 +- .../mapper/department/DepartmentMapper.xml | 59 +++++---- .../organization/mapper/job/JobMapper.java | 8 +- .../organization/mapper/job/JobMapper.xml | 124 +++++++++--------- .../service/impl/CompServiceImpl.java | 10 +- .../service/impl/DepartmentServiceImpl.java | 14 +- .../service/impl/HrmResourceServiceImpl.java | 6 +- .../service/impl/JobServiceImpl.java | 16 +-- .../organization/util/PageInfoSortUtil.java | 57 ++++++++ 13 files changed, 222 insertions(+), 161 deletions(-) create mode 100644 src/com/engine/organization/util/PageInfoSortUtil.java diff --git a/src/com/engine/organization/common/BaseQueryParam.java b/src/com/engine/organization/common/BaseQueryParam.java index c5defd50..b86d5412 100644 --- a/src/com/engine/organization/common/BaseQueryParam.java +++ b/src/com/engine/organization/common/BaseQueryParam.java @@ -19,4 +19,9 @@ public class BaseQueryParam { //每页数据条数 private Integer pageSize = 10; + + /** + * 排序 + */ + private String sortParams; } diff --git a/src/com/engine/organization/entity/company/param/CompSearchParam.java b/src/com/engine/organization/entity/company/param/CompSearchParam.java index a82c93b3..1134b99c 100644 --- a/src/com/engine/organization/entity/company/param/CompSearchParam.java +++ b/src/com/engine/organization/entity/company/param/CompSearchParam.java @@ -16,7 +16,7 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor -public class CompSearchParam extends BaseQueryParam { +public class CompSearchParam extends BaseQueryParam { /** * 主键 diff --git a/src/com/engine/organization/mapper/comp/CompMapper.java b/src/com/engine/organization/mapper/comp/CompMapper.java index 29bc23b3..8f10abcc 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.java +++ b/src/com/engine/organization/mapper/comp/CompMapper.java @@ -19,7 +19,7 @@ public interface CompMapper { * * @return */ - List list(); + List list(@Param("orderSql") String orderSql); /** * 查询所有被引用的ID @@ -33,7 +33,7 @@ public interface CompMapper { * * @return */ - List listByFilter(CompPO compPO); + List listByFilter(@Param("compPO") CompPO compPO, @Param("orderSql") String orderSql); /** * 获取顶级数据 @@ -95,13 +95,13 @@ public interface CompMapper { /** * 根据ID批量查询数据 + * * @param ids * @return */ List getCompsByIds(@Param("ids") Collection ids); - /** * 保存公司/分部基础信息 * @@ -136,6 +136,7 @@ public interface CompMapper { /** * 获取最大排序 + * * @return */ int getMaxShowOrder(); diff --git a/src/com/engine/organization/mapper/comp/CompMapper.xml b/src/com/engine/organization/mapper/comp/CompMapper.xml index 124ed2cc..d22ac668 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.xml +++ b/src/com/engine/organization/mapper/comp/CompMapper.xml @@ -144,7 +144,7 @@ FROM jcl_org_comp t - WHERE t.delete_type = 0 order by show_order + WHERE t.delete_type = 0 order by ${orderSql} - SELECT FROM jcl_org_comp t WHERE t.delete_type = 0 - - and t.parent_company = #{parentCompany} + + and t.parent_company = #{compPO.parentCompany} - - and t.industry = #{industry} + + and t.industry = #{compPO.industry} - - and t.comp_principal = #{compPrincipal} + + and t.comp_principal = #{compPO.compPrincipal} - - and t.forbidden_tag = #{forbiddenTag} + + and t.forbidden_tag = #{compPO.forbiddenTag} + order by ${orderSql}