From 91a8ad0bd3839f4a9a0d4ec44bfd3d9b742a4724 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 7 Sep 2022 19:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DepartmentServiceImpl.java | 3 +- .../service/impl/ImportCommonServiceImpl.java | 2 +- .../service/impl/JobServiceImpl.java | 3 +- .../hrmimport/HrmImportProcessE9.java | 119 +++++++++--------- 4 files changed, 66 insertions(+), 61 deletions(-) diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index d75e238d..7be24c46 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -549,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(); @@ -568,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/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 23add417..0008f508 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -474,9 +474,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/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;