diff --git a/docs/脚本/Mysql/表结构、初始化数据.sql b/docs/脚本/Mysql/表结构、初始化数据.sql index 41c827fa..871ff19e 100644 --- a/docs/脚本/Mysql/表结构、初始化数据.sql +++ b/docs/脚本/Mysql/表结构、初始化数据.sql @@ -609,7 +609,7 @@ insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (26, 3, 'JCL_ORG_JOB', 'ec_department', '所属部门', 'int', 3, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, now(), NULL, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (27, 3, 'JCL_ORG_JOB', 'work_authority', '工作权限', 'text', 2, 6, 1, 0, 1, 1, 1, 0, 1, 3, 1, 0, now(), NULL, NULL, NULL, 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (28, 3, 'JCL_ORG_JOB', 'level_id', '职等', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 4, 1, 0, now(), NULL, '162', '["browser",{"valueSpan":"自定义多选","replaceDatas":[{"itemorderid":"162","name":"自定义多选","id":"162","parenttitle":"集成","title":"集成-自定义多选"}],"value":"162"},{"valueSpan":"职等浏览按钮","replaceDatas":[{"showname":"LevelBrowser","name":"职等浏览按钮","id":"LevelBrowser"}],"value":"LevelBrowser"}]', 0); -insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 4, 1, 0, now(), NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0); +insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 0, 0, 0, 1, 4, 1, 0, now(), NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (30, 3, 'JCL_ORG_JOB', 'grade_id', '职级', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 3, 1, 0, now(), NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"itemorderid":"161","name":"自定义单选","id":"161","parenttitle":"集成","title":"集成-自定义单选"}],"value":"161"},{"valueSpan":"职级浏览按钮","replaceDatas":[{"showname":"gradeBrowser","name":"职级浏览按钮","id":"gradeBrowser"}],"value":"gradeBrowser"}]', 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (31, 3, 'JCL_ORG_JOB', 'parent_job', '上级岗位', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, now(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"jobBrowser","valueSpan":"岗位浏览按钮","replaceDatas":[{"showname":"jobBrowser","shownamespan":"jobBrowser","namespan":"岗位浏览按钮","name":"岗位浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"jobBrowser","id":"jobBrowser"}]}]', 0); insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (32, 3, 'JCL_ORG_JOB', 'is_key', '是否关键岗', 'int', 5, 3, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, now(), NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"否"},{"default":"","unuse":"0","id":"1","key":"1","option":"是"}],"sort":"horizontal"}]', 0); diff --git a/docs/脚本/Oracle/表结构、初始化数据Oracle.sql b/docs/脚本/Oracle/表结构、初始化数据Oracle.sql index 6b375e15..d9c0fda2 100644 --- a/docs/脚本/Oracle/表结构、初始化数据Oracle.sql +++ b/docs/脚本/Oracle/表结构、初始化数据Oracle.sql @@ -1067,7 +1067,7 @@ insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, fiel / insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (28, 3, 'JCL_ORG_JOB', 'level_id', '职等', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 4, 1, 0, SYSDATE, NULL, '162', '["browser",{"valueSpan":"自定义多选","replaceDatas":[{"itemorderid":"162","name":"自定义多选","id":"162","parenttitle":"集成","title":"集成-自定义多选"}],"value":"162"},{"valueSpan":"职等浏览按钮","replaceDatas":[{"showname":"LevelBrowser","name":"职等浏览按钮","id":"LevelBrowser"}],"value":"LevelBrowser"}]', 0) / -insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 4, 1, 0, SYSDATE, NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0) +insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 0, 0, 0, 1, 4, 1, 0, SYSDATE, NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0) / insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (30, 3, 'JCL_ORG_JOB', 'grade_id', '职级', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 3, 1, 0, SYSDATE, NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"itemorderid":"161","name":"自定义单选","id":"161","parenttitle":"集成","title":"集成-自定义单选"}],"value":"161"},{"valueSpan":"职级浏览按钮","replaceDatas":[{"showname":"gradeBrowser","name":"职级浏览按钮","id":"gradeBrowser"}],"value":"gradeBrowser"}]', 0) / diff --git a/docs/脚本/SqlServer/表结构、基础数据.sql b/docs/脚本/SqlServer/表结构、基础数据.sql index 0fd74720..920c85e1 100644 --- a/docs/脚本/SqlServer/表结构、基础数据.sql +++ b/docs/脚本/SqlServer/表结构、基础数据.sql @@ -989,7 +989,7 @@ GO insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (26, 3, 'JCL_ORG_JOB', 'ec_department', '所属部门', 'int', 3, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 0, GETDATE(), NULL, '4', '["browser",{"valueSpan":"部门","replaceDatas":[{"name":"部门","id":"4"}],"value":"4"}]', 0) insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (27, 3, 'JCL_ORG_JOB', 'work_authority', '工作权限', 'text', 2, 6, 1, 0, 1, 1, 1, 0, 1, 3, 1, 0, GETDATE(), NULL, NULL, NULL, 0) insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (28, 3, 'JCL_ORG_JOB', 'level_id', '职等', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 4, 1, 0, GETDATE(), NULL, '162', '["browser",{"valueSpan":"自定义多选","replaceDatas":[{"itemorderid":"162","name":"自定义多选","id":"162","parenttitle":"集成","title":"集成-自定义多选"}],"value":"162"},{"valueSpan":"职等浏览按钮","replaceDatas":[{"showname":"LevelBrowser","name":"职等浏览按钮","id":"LevelBrowser"}],"value":"LevelBrowser"}]', 0) - insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 4, 1, 0, GETDATE(), NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0) + insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (29, 3, 'JCL_ORG_JOB', 'ec_company', '所属分部', 'int', 3, 3, 1, 0, 1, 0, 0, 0, 1, 4, 1, 0, GETDATE(), NULL, '164', '["browser",{"valueSpan":"分部","replaceDatas":[{"name":"分部","id":"164"}],"value":"164"}]', 0) insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (30, 3, 'JCL_ORG_JOB', 'grade_id', '职级', 'text', 3, 5, 1, 0, 1, NULL, 1, 1, 1, 3, 1, 0, GETDATE(), NULL, '161', '["browser",{"valueSpan":"自定义单选","replaceDatas":[{"itemorderid":"161","name":"自定义单选","id":"161","parenttitle":"集成","title":"集成-自定义单选"}],"value":"161"},{"valueSpan":"职级浏览按钮","replaceDatas":[{"showname":"gradeBrowser","name":"职级浏览按钮","id":"gradeBrowser"}],"value":"gradeBrowser"}]', 0) insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (31, 3, 'JCL_ORG_JOB', 'parent_job', '上级岗位', 'int', 3, 3, 1, 0, 1, 1, 1, 1, 1, 5, 1, 0, GETDATE(), NULL, '161', '["browser",{"value":"161","valueSpan":"自定义单选","replaceDatas":[{"id":"161","name":"自定义单选"}]},{"value":"jobBrowser","valueSpan":"岗位浏览按钮","replaceDatas":[{"showname":"jobBrowser","shownamespan":"jobBrowser","namespan":"岗位浏览按钮","name":"岗位浏览按钮","showtypespan":"树形","randomFieldIdspan":"","showtype":"2","randomFieldId":"jobBrowser","id":"jobBrowser"}]}]', 0) insert INTO jcl_field_extendinfo (id, extend_type, table_name, field_name, field_name_desc, field_type, control_type, extend_group_id, isenable, isrequired, list_show, search_show, edit_show, add_show, browser_show, show_order, creator, delete_type, create_time, update_time, browser_type, custom_value, is_system_default) VALUES (32, 3, 'JCL_ORG_JOB', 'is_key', '是否关键岗', 'int', 5, 3, 1, 0, 1, 1, 1, 1, 1, 6, 1, 0, GETDATE(), NULL, NULL, '["select","select",{"datas":[{"default":"","unuse":"0","id":"0","key":"0","option":"否"},{"default":"","unuse":"0","id":"1","key":"1","option":"是"}],"sort":"horizontal"}]', 0) diff --git a/src/com/engine/organization/service/DepartmentService.java b/src/com/engine/organization/service/DepartmentService.java index a3d382e0..0433a164 100644 --- a/src/com/engine/organization/service/DepartmentService.java +++ b/src/com/engine/organization/service/DepartmentService.java @@ -113,7 +113,7 @@ public interface DepartmentService { * * @return */ - Map getSaveForm(); + Map getSaveForm(DeptSearchParam param); /** * 复制表单 diff --git a/src/com/engine/organization/service/ExtService.java b/src/com/engine/organization/service/ExtService.java index 2b848726..2f53be80 100644 --- a/src/com/engine/organization/service/ExtService.java +++ b/src/com/engine/organization/service/ExtService.java @@ -38,7 +38,7 @@ public interface ExtService { * @param groupId * @return */ - List getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType, String... readOnlyFields); + List getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType, Map params, String... readOnlyFields); /** * 组装明细表表单 @@ -51,7 +51,7 @@ public interface ExtService { * @param showLabel * @return */ - List> getExtendTables(User user, String extendType, Long groupId,String tableName, long id, int viewAttr, boolean showLabel); + List> getExtendTables(User user, String extendType, Long groupId, String tableName, long id, int viewAttr, boolean showLabel); /** * 拓展页面分组 * diff --git a/src/com/engine/organization/service/JobService.java b/src/com/engine/organization/service/JobService.java index 95cfb27e..dab71f97 100644 --- a/src/com/engine/organization/service/JobService.java +++ b/src/com/engine/organization/service/JobService.java @@ -50,7 +50,7 @@ public interface JobService { * * @return */ - Map getSaveForm(); + Map getSaveForm(JobSearchParam param); /** * 获取详细表单 diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index e633b28b..66ad696d 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -331,7 +331,7 @@ public class CompServiceImpl extends Service implements CompService { List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID, "1"); if (CollectionUtils.isNotEmpty(extendTitles)) { for (ExtendTitlePO extendTitle : extendTitles) { - List items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_COMP, 2, extendTitle.getId() + "", "comp_no", RuleCodeType.SUBCOMPANY.getValue()); + List items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_COMP, 2, extendTitle.getId() + "", "comp_no", RuleCodeType.SUBCOMPANY.getValue(), null); if (CollectionUtils.isNotEmpty(items)) { addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items)); } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index c8abead8..7be24c46 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -420,15 +420,33 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } @Override - public Map getSaveForm() { + public Map getSaveForm(DeptSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID, "1"); - if (CollectionUtils.isNotEmpty(extendTitles)) { + Map params = new HashMap<>(); + // 分部 + if (StringUtils.isNotBlank(Util.null2String(param.getSubcompanyid1()))) { + CompPO compPO = getCompMapper().listById(param.getSubcompanyid1()); + if (null != compPO) { + params.put("parent_comp", compPO.getId()); + params.put("ec_company", EcHrmRelationUtil.getEcCompanyId(compPO.getId().toString())); + } + } + // 部门 + if (StringUtils.isNotBlank(Util.null2String(param.getDepartmentid()))) { + DepartmentPO deptById = getDepartmentMapper().getDeptById(param.getDepartmentid()); + if (null != deptById) { + params.put("parent_dept", deptById.getId()); + params.put("ec_department", EcHrmRelationUtil.getEcDepartmentId(deptById.getId().toString())); + params.put("parent_comp", deptById.getParentComp()); + params.put("ec_company", EcHrmRelationUtil.getEcCompanyId(deptById.getParentComp().toString())); + } + } for (ExtendTitlePO extendTitle : extendTitles) { - List items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_DEPT, 2, extendTitle.getId().toString(), "dept_no", RuleCodeType.DEPARTMENT.getValue()); + List items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_DEPT, 2, extendTitle.getId().toString(), "dept_no", RuleCodeType.DEPARTMENT.getValue(), params); if (CollectionUtils.isNotEmpty(items)) { addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items)); } @@ -531,6 +549,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int mergeDepartment(DepartmentMergeParam mergeParam) { + //TODO 逻辑重写，被合并部门，子元素全部转移。被合并部门删除、封存 HasRightUtil.hasRight(user, RIGHT_NAME, false); int updateCount; Long ecParamDepartment = mergeParam.getDepartment(); @@ -550,7 +569,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } OrganizationAssert.isFalse(disableIds.contains(targetDepartment.getId()), "请勿选择当前部门本身及其子部门"); - // 所选部门 + //TODO 被合并部门 DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId()); mergeDepartment.setDeptName(mergeParam.getMergeName()); mergeDepartment.setDeptNameShort(mergeParam.getMergeName()); diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 429452ca..ac276c00 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -92,16 +92,18 @@ public class ExtServiceImpl extends Service implements ExtService { } @Override - public List getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType, String... readOnlyFields) { + public List getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType, Map params, String... readOnlyFields) { List conditionItems = new ArrayList<>(); - + if (null == params) { + params = new HashMap<>(); + } // 2编辑 1查看 OrganizationAssert.notNull(groupId, "请选择对应的拓展页"); List infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.ADD.getValue(), "1"); // 组装拓展页内容 List readOnlyFieldList = Arrays.asList(readOnlyFields); for (ExtendInfoPO extendInfoPO : infoPOList) { - SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null); + SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, params.get(extendInfoPO.getFieldName())); item.setFieldcol(16); if (CollectionUtils.isNotEmpty(readOnlyFieldList) && readOnlyFieldList.contains(extendInfoPO.getFieldName())) { item.setViewAttr(1); diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index d4cd3cd4..0add18a3 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -172,10 +172,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic public Map getSaveForm() { Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); - List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID,"1"); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID, "1"); 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))); + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_HRM, 2, extendTitle.getId() + "", null, null, null))); } } apiDatas.put("condition", addGroups); @@ -203,7 +203,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic if ("0".equals(groupId)) { groupId = GROUP_ID.toString(); } - List extendTitles = getExtendTitleMapper().getTitlesByGroupID(Long.parseLong(groupId),"1"); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(Long.parseLong(groupId), "1"); if (CollectionUtils.isNotEmpty(extendTitles)) { for (ExtendTitlePO extendTitle : extendTitles) { diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index 5c48f59b..cc633554 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -155,7 +155,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ // TODO 分部、部门 List fieldDatas = mergeList.stream().map(item -> FieldTypeTreeParam.builder().id(item.getFieldId()).name(item.getFieldLabel()).build()).collect(Collectors.toList()); - List selectedKeys = mergeList.stream().filter(item -> ("1".equals(item.getRequired()) || "subcompanyid1".equals(item.getFieldName()) || "departmentid".equals(item.getFieldName()))).map(CusFormFieldPO::getFieldId).collect(Collectors.toList()); + List selectedKeys = mergeList.stream().filter(item -> ("1".equals(item.getRequired()) || "workcode".equals(item.getFieldName()) || "subcompanyid1".equals(item.getFieldName()) || "departmentid".equals(item.getFieldName()))).map(CusFormFieldPO::getFieldId).collect(Collectors.toList()); returnMaps.put("data", fieldDatas); returnMaps.put("selectedKeys", selectedKeys); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index a354a65e..1afd4c2f 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -213,7 +213,7 @@ public class JobServiceImpl extends Service implements JobService { // 等级方案 SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser"); // 上级岗位 - SearchConditionItem parentJobBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级岗位", "161", "parentJob", "jobBrowser"); + SearchConditionItem parentJobBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级岗位", "666", "parentJob", ""); // 是否关键岗 List isKeyOptions = new ArrayList<>(); SearchConditionOption yesOption = new SearchConditionOption("0", "否"); @@ -248,14 +248,33 @@ public class JobServiceImpl extends Service implements JobService { } @Override - public Map getSaveForm() { + public Map getSaveForm(JobSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID, "1"); if (CollectionUtils.isNotEmpty(extendTitles)) { + Map params = new HashMap<>(); + // 分部 + if (StringUtils.isNotBlank(Util.null2String(param.getSubcompanyid1()))) { + CompPO compPO = getCompMapper().listById(param.getSubcompanyid1()); + if (null != compPO) { + params.put("parent_comp", compPO.getId()); + params.put("ec_company", EcHrmRelationUtil.getEcCompanyId(compPO.getId().toString())); + } + } + // 部门 + if (StringUtils.isNotBlank(Util.null2String(param.getDepartmentid()))) { + DepartmentPO deptById = getDepartmentMapper().getDeptById(param.getDepartmentid()); + if (null != deptById) { + params.put("parent_dept", deptById.getId()); + params.put("ec_department", EcHrmRelationUtil.getEcDepartmentId(deptById.getId().toString())); + params.put("parent_comp", deptById.getParentComp()); + params.put("ec_company", EcHrmRelationUtil.getEcCompanyId(deptById.getParentComp().toString())); + } + } for (ExtendTitlePO extendTitle : extendTitles) { - List items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_JOB, 2, extendTitle.getId().toString(), "job_no", RuleCodeType.JOBTITLES.getValue(), "scheme_id", "parent_comp"); + List items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_JOB, 2, extendTitle.getId().toString(), "job_no", RuleCodeType.JOBTITLES.getValue(), params, "scheme_id", "parent_comp"); if (CollectionUtils.isNotEmpty(items)) { addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items)); } @@ -396,7 +415,12 @@ public class JobServiceImpl extends Service implements JobService { JobPO jobById = getJobMapper().getJobById(id); // 处理自动编号 jobById.setJobNo(CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, jobById.getJobNo(), System.currentTimeMillis())); - jobById.setParentDept(Long.parseLong(department)); + // 部门赋值 + jobById.setEcDepartment(Long.parseLong(department)); + DepartmentPO jclDepartmentId = EcHrmRelationUtil.getJclDepartmentId(department); + if (null != jclDepartmentId) { + jobById.setParentDept(jclDepartmentId.getId()); + } jobById.setShowOrder(orderNum); insertCount += getJobMapper().insertIgnoreNull(jobById); // 更新组织架构图 @@ -461,9 +485,10 @@ public class JobServiceImpl extends Service implements JobService { @Override public int mergeJob(JobMergeParam mergeParam) { + //TODO 人员合并 HasRightUtil.hasRight(user, RIGHT_NAME, false); int updateCount; - OrganizationAssert.notNull(mergeParam.getTargetJob(), "请选择需要合并的部门"); + OrganizationAssert.notNull(mergeParam.getTargetJob(), "请选择需要合并的岗位"); Set disableIds = new HashSet<>(); disableIds.add(mergeParam.getId()); List jobs = getJobMapper().getJobsByPid(mergeParam.getId()); diff --git a/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java b/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java index 18a34cd9..85b7b3ea 100644 --- a/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java +++ b/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java @@ -59,25 +59,25 @@ public class CusFieldDataTrigger { MapperProxyFactory.getProxy(SystemDataMapper.class).insertCusFieldData(directionData); } - // field100001更新 - if (null != sourceField100001 && sourceField100001.split("_").length == 2 && !sourceField100001.equals(directionData.getField100001())) { + // field100001更新,职等职级 + if (null != sourceField100001 && sourceField100001.split("A").length == 3 && !sourceField100001.equals(directionData.getField100001())) { directionData.setField100001(sourceField100001); - String[] field100001Array = sourceField100001.split("_"); + String[] field100001Array = sourceField100001.split("A"); // 职等 - long zdId = Long.parseLong(field100001Array[1]); - if (zdId > 1000) { - zdId = zdId - 1000; - } + long zdId = Long.parseLong(field100001Array[2]); + long zjId = Long.parseLong(field100001Array[1]); + long xlId = Long.parseLong(field100001Array[0].split("_")[1]); + LevelPO levelByID = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByID(zdId); directionData.setField100008(levelByID.getLevelName()); // 职等职级方案 SchemePO schemeByID = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByID(levelByID.getSchemeId()); directionData.setField100006(schemeByID.getSchemeName()); // 职级 - GradePO gradeByLevelId = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByLevelId(zdId); + GradePO gradeByLevelId = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(zjId); directionData.setField100007(gradeByLevelId.getGradeName()); - MapperProxyFactory.getProxy(SequenceMapper.class).getSequenceBySchemeId(schemeByID.getId()); - SequencePO sequenceBySchemeId = MapperProxyFactory.getProxy(SequenceMapper.class).getSequenceBySchemeId(levelByID.getSchemeId()); + // 岗位序列 + SequencePO sequenceBySchemeId = MapperProxyFactory.getProxy(SequenceMapper.class).getSequenceByID(xlId); directionData.setField100005(sequenceBySchemeId.getSequenceName()); updateFlag = true; } diff --git a/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java b/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java index e9b0b219..63148f32 100644 --- a/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java +++ b/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java @@ -426,26 +426,29 @@ public class HrmImportProcessE9 extends BaseBean { hrm.setAccounttype(0); } - // 岗位id - if (vo.getJobtitle() != null && vo.getJobactivityid() != null && vo.getJobgroupid() != null) { - int jobtitle = getJobTitles(vo.getJobtitle(), vo - .getJobactivityid(), vo.getJobgroupid()); - /// -1:职务类别不存在，-2：职务不存在，-3：职务类别不存在 - if (jobtitle == -1) { - resultList.add(createLog(vo, "创建", "失败", "职务类别不存在")); - continue; - } else if (jobtitle == -2) { - resultList.add(createLog(vo, "创建", "失败", "职务不存在")); - continue; - } else if (jobtitle == -3) { - resultList.add(createLog(vo, "创建", "失败", "岗位名称不存在")); - continue; - } - hrm.setJobtitle(jobtitle); - } else { - resultList.add(createLog(vo, "创建", "失败", SystemEnv.getHtmlLabelName(83531, userlanguage))); - continue; - } + //// 岗位id + //if (vo.getJobtitle() != null && vo.getJobactivityid() != null && vo.getJobgroupid() != null) { + // int jobtitle = getJobTitles(vo.getJobtitle(), vo + // .getJobactivityid(), vo.getJobgroupid()); + // /// -1:职务类别不存在，-2：职务不存在，-3：职务类别不存在 + // if (jobtitle == -1) { + // resultList.add(createLog(vo, "创建", "失败", "职务类别不存在")); + // continue; + // } else if (jobtitle == -2) { + // resultList.add(createLog(vo, "创建", "失败", "职务不存在")); + // continue; + // } else if (jobtitle == -3) { + // resultList.add(createLog(vo, "创建", "失败", "岗位名称不存在")); + // continue; + // } + // hrm.setJobtitle(jobtitle); + //} else { + // resultList.add(createLog(vo, "创建", "失败", SystemEnv.getHtmlLabelName(83531, userlanguage))); + // continue; + //} + + // 担任岗位字段校验 + //上级id if (vo.getManagerid() != null) { @@ -963,44 +966,44 @@ public class HrmImportProcessE9 extends BaseBean { } } - // 岗位id - if ("".equals(Util.null2String(vo.getJobtitle())) && (!"".equals(Util.null2String(vo.getJobactivityid())) || !"".equals(Util.null2String(vo.getJobgroupid())))) { - resultList.add(createLog(vo, "更新", "失败", SystemEnv.getHtmlLabelName(83544, userlanguage))); - continue; - } - if (!"".equals(Util.null2String(vo.getJobtitle()))) { - String jobtitle; - String jobactivityid; - String jobactivityname; - String jobgroupid; - String jobgroupname; - if (vo.getJobactivityid() == null) { - jobtitle = resourcecominfo.getJobTitle(hrmId); - jobactivityid = jobTitlesComInfo.getJobactivityid(jobtitle); - jobactivityname = jobActivitiesComInfo.getJobActivitiesname(jobactivityid); - } else - jobactivityname = vo.getJobactivityid(); - if (vo.getJobgroupid() == null) { - jobtitle = resourcecominfo.getJobTitle(hrmId); - jobactivityid = jobTitlesComInfo.getJobactivityid(jobtitle); - jobgroupid = jobActivitiesComInfo.getJobgroupid(jobactivityid); - jobgroupname = jobGroupsComInfo.getJobGroupsname(jobgroupid); - } else { - jobgroupname = vo.getJobgroupid(); - } - int jobtitleid = getJobTitles(vo.getJobtitle(), jobactivityname, jobgroupname); - if (jobtitleid == -1) { - resultList.add(createLog(vo, "创建", "失败", "职务类别不存在")); - continue; - } else if (jobtitleid == -2) { - resultList.add(createLog(vo, "创建", "失败", "职务不存在")); - continue; - } else if (jobtitleid == -3) { - resultList.add(createLog(vo, "创建", "失败", "岗位名称不存在")); - continue; - } - hrm.setJobtitle(jobtitleid); - } + //// 岗位id + //if ("".equals(Util.null2String(vo.getJobtitle())) && (!"".equals(Util.null2String(vo.getJobactivityid())) || !"".equals(Util.null2String(vo.getJobgroupid())))) { + // resultList.add(createLog(vo, "更新", "失败", SystemEnv.getHtmlLabelName(83544, userlanguage))); + // continue; + //} + //if (!"".equals(Util.null2String(vo.getJobtitle()))) { + // String jobtitle; + // String jobactivityid; + // String jobactivityname; + // String jobgroupid; + // String jobgroupname; + // if (vo.getJobactivityid() == null) { + // jobtitle = resourcecominfo.getJobTitle(hrmId); + // jobactivityid = jobTitlesComInfo.getJobactivityid(jobtitle); + // jobactivityname = jobActivitiesComInfo.getJobActivitiesname(jobactivityid); + // } else + // jobactivityname = vo.getJobactivityid(); + // if (vo.getJobgroupid() == null) { + // jobtitle = resourcecominfo.getJobTitle(hrmId); + // jobactivityid = jobTitlesComInfo.getJobactivityid(jobtitle); + // jobgroupid = jobActivitiesComInfo.getJobgroupid(jobactivityid); + // jobgroupname = jobGroupsComInfo.getJobGroupsname(jobgroupid); + // } else { + // jobgroupname = vo.getJobgroupid(); + // } + // int jobtitleid = getJobTitles(vo.getJobtitle(), jobactivityname, jobgroupname); + // if (jobtitleid == -1) { + // resultList.add(createLog(vo, "创建", "失败", "职务类别不存在")); + // continue; + // } else if (jobtitleid == -2) { + // resultList.add(createLog(vo, "创建", "失败", "职务不存在")); + // continue; + // } else if (jobtitleid == -3) { + // resultList.add(createLog(vo, "创建", "失败", "岗位名称不存在")); + // continue; + // } + // hrm.setJobtitle(jobtitleid); + //} if (Util.getIntValue(hrmId) < 0) continue; diff --git a/src/com/engine/organization/web/DepartmentController.java b/src/com/engine/organization/web/DepartmentController.java index 7f208e57..edd39910 100644 --- a/src/com/engine/organization/web/DepartmentController.java +++ b/src/com/engine/organization/web/DepartmentController.java @@ -44,7 +44,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); return getDepartmentWrapper(user).getDeptListByPid(querySingleDeptListParam); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -58,7 +58,7 @@ public class DepartmentController { String parentDept = (String) map.get("parentDept"); return ReturnResult.successed(getDepartmentWrapper(user).getJobListByPid(QuerySingleDeptListParam.builder().parentDept(Long.parseLong(parentDept)).build())); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -96,7 +96,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).listPage(params)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -116,7 +116,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).saveBaseForm(params)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -136,7 +136,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).updateForbiddenTagById(param)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -156,7 +156,7 @@ public class DepartmentController { Map map = ParamUtil.request2Map(request); return ReturnResult.successed(getDepartmentWrapper(user).updateForm(map)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -177,7 +177,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -197,7 +197,7 @@ public class DepartmentController { Map map = ParamUtil.request2Map(request); return ReturnResult.successed(getDepartmentWrapper(user).getSearchCondition(map)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -216,7 +216,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).getHasRight()); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -236,7 +236,7 @@ public class DepartmentController { Map map = ParamUtil.request2Map(request); return ReturnResult.successed(getDepartmentWrapper(user).getDeptBaseForm(map)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -253,9 +253,11 @@ public class DepartmentController { public ReturnResult getSaveForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).getSaveForm()); + Map map = ParamUtil.request2Map(request); + DeptSearchParam param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), DeptSearchParam.class); + return ReturnResult.successed(getDepartmentWrapper(user).getSaveForm(param)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -268,7 +270,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).getCopyForm()); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -280,7 +282,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).copyDepartment(copyParam)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -294,7 +296,7 @@ public class DepartmentController { String id = (String) map.get("id"); return ReturnResult.successed(getDepartmentWrapper(user).getMergeForm(Long.parseLong(id))); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -306,7 +308,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).mergeDepartment(mergeParam)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -318,7 +320,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).getMoveForm()); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } @@ -330,7 +332,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).moveDepartment(moveParam)); } catch (Exception e) { - return ReturnResult.exceptionHandle(e); + return ReturnResult.exceptionHandle(e); } } diff --git a/src/com/engine/organization/web/JobController.java b/src/com/engine/organization/web/JobController.java index 9e93de61..c191a1dd 100644 --- a/src/com/engine/organization/web/JobController.java +++ b/src/com/engine/organization/web/JobController.java @@ -84,7 +84,9 @@ public class JobController { public ReturnResult getSaveForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getJobWrapper(user).getSaveForm()); + Map map = ParamUtil.request2Map(request); + JobSearchParam param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), JobSearchParam.class); + return ReturnResult.successed(getJobWrapper(user).getSaveForm(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java index b0903d5f..d81f1564 100644 --- a/src/com/engine/organization/wrapper/DepartmentWrapper.java +++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java @@ -82,8 +82,8 @@ public class DepartmentWrapper extends OrganizationWrapper { * * @return */ - public Map getSaveForm() { - return getDepartmentService(user).getSaveForm(); + public Map getSaveForm(DeptSearchParam param) { + return getDepartmentService(user).getSaveForm(param); } /** diff --git a/src/com/engine/organization/wrapper/JobWrapper.java b/src/com/engine/organization/wrapper/JobWrapper.java index 0c9f4249..34719bf1 100644 --- a/src/com/engine/organization/wrapper/JobWrapper.java +++ b/src/com/engine/organization/wrapper/JobWrapper.java @@ -86,8 +86,8 @@ public class JobWrapper extends OrganizationWrapper { * * @return */ - public Map getSaveForm() { - return getJobService(user).getSaveForm(); + public Map getSaveForm(JobSearchParam param) { + return getJobService(user).getSaveForm(param); } /**