From 16fcd7646885e3643c16a92c2d806af1840dfed6 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 15 Sep 2022 18:31:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=88=B6=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/enums}/OrgImportAdapter.java | 2 +- .../organization/enums}/OrgImportEnum.java | 6 +++--- .../service/impl/ImportCommonServiceImpl.java | 4 ++-- .../organization/service/impl/JobServiceImpl.java | 14 ++++++++++++++ .../organization/thread/OrganizationSyncEc.java | 8 ++++++++ .../util/saveimport}/StaffInfoImportUtil.java | 3 +-- 6 files changed, 29 insertions(+), 8 deletions(-) rename src/com/{orgimport/service => engine/organization/enums}/OrgImportAdapter.java (88%) rename src/com/{orgimport/service => engine/organization/enums}/OrgImportEnum.java (90%) rename src/com/{orgimport/service/action => engine/organization/util/saveimport}/StaffInfoImportUtil.java (99%) diff --git a/src/com/orgimport/service/OrgImportAdapter.java b/src/com/engine/organization/enums/OrgImportAdapter.java similarity index 88% rename from src/com/orgimport/service/OrgImportAdapter.java rename to src/com/engine/organization/enums/OrgImportAdapter.java index 56d61bd4..99955cf6 100644 --- a/src/com/orgimport/service/OrgImportAdapter.java +++ b/src/com/engine/organization/enums/OrgImportAdapter.java @@ -1,4 +1,4 @@ -package com.orgimport.service; +package com.engine.organization.enums; import weaver.hrm.User; diff --git a/src/com/orgimport/service/OrgImportEnum.java b/src/com/engine/organization/enums/OrgImportEnum.java similarity index 90% rename from src/com/orgimport/service/OrgImportEnum.java rename to src/com/engine/organization/enums/OrgImportEnum.java index 0b7cbe7b..eea07e33 100644 --- a/src/com/orgimport/service/OrgImportEnum.java +++ b/src/com/engine/organization/enums/OrgImportEnum.java @@ -1,7 +1,7 @@ -package com.orgimport.service; +package com.engine.organization.enums; import com.engine.organization.exception.OrganizationRunTimeException; -import com.orgimport.service.action.StaffInfoImportUtil; +import com.engine.organization.util.saveimport.StaffInfoImportUtil; import weaver.hrm.User; import java.util.HashMap; @@ -14,7 +14,7 @@ import java.util.Map; * @version: 1.0 */ public enum OrgImportEnum implements OrgImportAdapter { - STAFF("staff_info") { + STAFF("staff") { @Override public Map orgImport(Map params, User user) { Map resultMap = new HashMap<>(); diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index 3b8096c1..7f68cc0b 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -42,7 +42,7 @@ import com.engine.organization.util.excel.ExcelUtil; import com.engine.organization.util.relation.EcHrmRelationUtil; import com.engine.organization.util.saveimport.hrmimport.HrmImportAdaptExcelE9; import com.engine.organization.util.saveimport.hrmimport.HrmImportProcessE9; -import com.orgimport.service.OrgImportEnum; +import com.engine.organization.enums.OrgImportEnum; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.xssf.usermodel.XSSFCell; @@ -1181,7 +1181,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ map.put("update_time", new Date()); map.put("jobactivityid", JobServiceImpl.JOB_ACTIVITY_ID); map.put("id", jobId); - Map syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, map, false).sync(); + Map syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, map, MapperProxyFactory.getProxy(JobMapper.class).getJobById(jobId), false).sync(); if (isThrowError(syncMap)) { map.remove("id"); map.remove("jobactivityid"); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index bac28f4f..db057adf 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -1,6 +1,7 @@ package com.engine.organization.service.impl; import com.alibaba.fastjson.JSONObject; +import com.api.browser.bean.BrowserBean; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.api.browser.bean.SearchConditionOption; @@ -11,6 +12,7 @@ import com.engine.core.impl.Service; import com.engine.hrm.entity.RuleCodeType; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.DeleteParam; +import com.engine.organization.entity.browser.po.CustomBrowserBean; import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.commom.RecordInfo; import com.engine.organization.entity.company.bo.CompBO; @@ -215,6 +217,12 @@ 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, "上级岗位", "666", "parentJob", ""); + BrowserBean browserBean = parentJobBrowserItem.getBrowserConditionParam(); + String s = JSONObject.toJSONString(browserBean); + CustomBrowserBean customBrowserBean = JSONObject.parseObject(s, CustomBrowserBean.class); + customBrowserBean.setHasLeftTree(true); + customBrowserBean.setLeftToSearchKey("treeKey"); + parentJobBrowserItem.setBrowserConditionParam(customBrowserBean); // 是否关键岗 List isKeyOptions = new ArrayList<>(); SearchConditionOption yesOption = new SearchConditionOption("0", "否"); @@ -484,6 +492,12 @@ public class JobServiceImpl extends Service implements JobService { List condition = new ArrayList<>(); SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到岗位", "666", "targetJob", ""); deptBrowserItem.setRules("required"); + BrowserBean browserBean = deptBrowserItem.getBrowserConditionParam(); + String s = JSONObject.toJSONString(browserBean); + CustomBrowserBean customBrowserBean = JSONObject.parseObject(s, CustomBrowserBean.class); + customBrowserBean.setHasLeftTree(true); + customBrowserBean.setLeftToSearchKey("treeKey"); + deptBrowserItem.setBrowserConditionParam(customBrowserBean); SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "合并后名称", "mergeName"); mergeNameItem.setRules("required|string"); JobPO jobById = getJobMapper().getJobById(id); diff --git a/src/com/engine/organization/thread/OrganizationSyncEc.java b/src/com/engine/organization/thread/OrganizationSyncEc.java index d112b96d..e4753f92 100644 --- a/src/com/engine/organization/thread/OrganizationSyncEc.java +++ b/src/com/engine/organization/thread/OrganizationSyncEc.java @@ -67,6 +67,14 @@ public class OrganizationSyncEc { this.user = user; this.oldJobPO = oldJobPO; } + public OrganizationSyncEc(User user, LogModuleNameEnum moduleName, OperateTypeEnum operateType, Map params, JobPO oldJobPO, boolean throwException) { + this.moduleName = moduleName; + this.operateType = operateType; + this.params = params; + this.user = user; + this.oldJobPO = oldJobPO; + this.throwException = throwException; + } public Map sync() { switch (moduleName) { diff --git a/src/com/orgimport/service/action/StaffInfoImportUtil.java b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java similarity index 99% rename from src/com/orgimport/service/action/StaffInfoImportUtil.java rename to src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java index 60821f6d..575958db 100644 --- a/src/com/orgimport/service/action/StaffInfoImportUtil.java +++ b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java @@ -1,4 +1,4 @@ -package com.orgimport.service.action; +package com.engine.organization.util.saveimport; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -19,7 +19,6 @@ import com.engine.organization.mapper.staff.StaffPlanMapper; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.relation.EcHrmRelationUtil; -import com.engine.organization.util.saveimport.OrgImportUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xssf.usermodel.XSSFCell;