From 92b246b5d51464a7974b854246a0c3c2760fc720 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 27 Oct 2022 14:39:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE?= =?UTF-8?q?=E7=9B=B8=E5=85=B3BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmresource/ResourceBasicInfoMapper.xml | 59 ++++++++ .../trigger/HrmResourceTriggerMapper.java | 5 +- .../service/impl/HrmResourceServiceImpl.java | 4 +- .../service/impl/ImportCommonServiceImpl.java | 26 ++-- .../thread/CompanyTriggerRunnable.java | 141 +++++++++--------- .../thread/DepartmentTriggerRunnable.java | 36 ++--- .../thread/HrmResourceTriggerRunnable.java | 11 +- .../util/saveimport/StaffInfoImportUtil.java | 6 +- 8 files changed, 167 insertions(+), 121 deletions(-) diff --git a/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.xml b/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.xml index 75399691..63ddf36d 100644 --- a/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.xml +++ b/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.xml @@ -161,6 +161,65 @@ + + + select JCL_ORG_ITEM_ID.currval from dual + + INSERT INTO jcl_org_item + + + fclassid, + + + fno, + + + fname, + + + fmemo, + + + fdelete, + + + creator, + + + create_time, + + + update_time, + + + + + #{fclassid}, + + + #{fno}, + + + #{fname}, + + + #{fmemo}, + + + #{fdelete}, + + + #{creator}, + + + #{createTime}, + + + #{updateTime}, + + + + diff --git a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java index 2d4d3011..2fb269fe 100644 --- a/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java +++ b/src/com/engine/organization/mapper/trigger/HrmResourceTriggerMapper.java @@ -3,6 +3,7 @@ package com.engine.organization.mapper.trigger; import org.apache.ibatis.annotations.Param; import weaver.hrm.passwordprotection.domain.HrmResource; +import java.sql.Date; import java.util.List; /** @@ -13,8 +14,8 @@ import java.util.List; public interface HrmResourceTriggerMapper { HrmResource getHrmResource(@Param("id") Long id); - List getFidsByFleader(@Param("fLeader") String fLeader, @Param("currentDate") String currentDate); + List getFidsByFleader(@Param("fLeader") String fLeader, @Param("currentDate") Date currentDate); - int updateLeaders(@Param("currentDate") String currentDate,@Param("fLeader") String fLeader, @Param("fLeaderImg") String fLeaderImg, @Param("fLeaderName") String fLeaderName, @Param("fLeaderJobId") Integer fLeaderJobId, @Param("fLeaderJob") String fLeaderJob, @Param("fLeaderLv") String fLeaderLv, @Param("fLeaderSt") String fLeaderSt); + int updateLeaders(@Param("currentDate") Date currentDate,@Param("fLeader") String fLeader, @Param("fLeaderImg") String fLeaderImg, @Param("fLeaderName") String fLeaderName, @Param("fLeaderJobId") Integer fLeaderJobId, @Param("fLeaderJob") String fLeaderJob, @Param("fLeaderLv") String fLeaderLv, @Param("fLeaderSt") String fLeaderSt); } diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index ec082250..d6b2040b 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -231,7 +231,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic RecordInfo recordInfo = getSystemDataMapper().getHrmObjectByID(HRM_RESOURCE, ecResourceId); params.put("uuid", recordInfo.getUuid()); Long resourceId = getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_HRM, params, "", null); - new Thread(new HrmResourceTriggerRunnable(resourceId)).start(); + new HrmResourceTriggerRunnable(resourceId).run(); return resourceId; } @@ -308,7 +308,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic //更新明细表 getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_HRMEXT_DT1, params, id); - new Thread(new HrmResourceTriggerRunnable(id)).start(); + new HrmResourceTriggerRunnable(id).run(); return updateCount; } diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index 1aca837d..9c8bf1d0 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -324,9 +324,9 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ lsPromptLabel.add(34275); lsPromptLabel.add(125452); lsPromptLabel.add(125466); - lsPromptLabel.add(522355); - lsPromptLabel.add(522356); - lsPromptLabel.add(522357); + //lsPromptLabel.add(522355); + //lsPromptLabel.add(522356); + //lsPromptLabel.add(522357); //lsPromptLabel.add(530411); for (int i = 0; i < lsPromptLabel.size(); i++) { @@ -386,9 +386,9 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ lsPromptLabel.add(34275); lsPromptLabel.add(125452); lsPromptLabel.add(125466); - lsPromptLabel.add(522355); - lsPromptLabel.add(522356); - lsPromptLabel.add(522357); + //lsPromptLabel.add(522355); + //lsPromptLabel.add(522356); + //lsPromptLabel.add(522357); //lsPromptLabel.add(530411); for (int i = 0; i < lsPromptLabel.size(); i++) { @@ -521,7 +521,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ lsPromptLabel.add(81699); lsPromptLabel.add(516263); //lsPromptLabel.add(81701); - lsPromptLabel.add(388880); + //lsPromptLabel.add(388880); lsPromptLabel.add(81702); lsPromptLabel.add(81703); lsPromptLabel.add(125869); @@ -1132,16 +1132,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName("JCL_ORG_JOB").params(map).build(); map.put("jobactivityid", JobServiceImpl.JOB_ACTIVITY_ID); - map.put("id", infoParams.getId()); Map syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.ADD, map, false).sync(); if (isThrowError(syncMap)) { boolean assertNameRepeat = JobServiceImpl.assertNameRepeat(null, Util.null2String(map.get("ec_department")), Util.null2String(map.get("parent_job")), Util.null2String(map.get("job_name"))); if (assertNameRepeat) { - map.remove("id"); map.remove("jobactivityid"); MapperProxyFactory.getProxy(ExtMapper.class).insertTable(infoParams); // 更新组织架构图 - new Thread(new JobTriggerRunnable(jobId)).start(); + new Thread(new JobTriggerRunnable(infoParams.getId())).start(); historyDetailPO.setOperateDetail("添加成功"); historyDetailPO.setStatus("1"); } else { @@ -1409,7 +1407,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ map.remove("id"); MapperProxyFactory.getProxy(ExtMapper.class).insertTable(infoParams); // 更新组织架构图 - new Thread(new HrmResourceTriggerRunnable(infoParams.getId())).start(); + new HrmResourceTriggerRunnable(infoParams.getId()).run(); historyDetailPO.setOperateDetail("添加成功"); historyDetailPO.setStatus("1"); @@ -1433,7 +1431,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ map.remove("id"); MapperProxyFactory.getProxy(ExtMapper.class).updateTable(ExtendInfoParams.builder().id(resourceId).tableName("JCL_ORG_HRMRESOURCE").params(map).build()); // 更新组织架构图 - new Thread(new HrmResourceTriggerRunnable(resourceId)).start(); + new HrmResourceTriggerRunnable(resourceId).run(); historyDetailPO.setOperateDetail("更新成功"); historyDetailPO.setStatus("1"); @@ -1527,10 +1525,10 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ Map optionMap = options.stream().collect(Collectors.toMap(FieldSelectOptionBean::getOption, FieldSelectOptionBean::getId, (k1, k2) -> k1)); object = optionMap.get(cellValue); break; - case 4:// CHECKBOX case 6: // FILEUPLOAD break; + case 4:// CHECKBOX case 7:// TEXT case 2:// TEXTAREA default: @@ -1602,7 +1600,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ iterator.remove(); } - if ("所属部门".equals(column) || "上级部门".equals(column) || "部门".equals(column)) { + if ("所属部门".equals(column) || "上级部门".equals(column)) { departmentColumn = column; iterator.remove(); } diff --git a/src/com/engine/organization/thread/CompanyTriggerRunnable.java b/src/com/engine/organization/thread/CompanyTriggerRunnable.java index f170edf9..0f6a757d 100644 --- a/src/com/engine/organization/thread/CompanyTriggerRunnable.java +++ b/src/com/engine/organization/thread/CompanyTriggerRunnable.java @@ -2,23 +2,22 @@ package com.engine.organization.thread; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.hrmresource.po.HrmResourcePO; -import com.engine.organization.entity.logview.bo.FieldBaseEquator; +import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.map.JclOrgMap; +import com.engine.organization.entity.personnelcard.User; import com.engine.organization.entity.staff.po.StaffPO; import com.engine.organization.enums.ModuleTypeEnum; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.jclorgmap.JclOrgMapper; +import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.mapper.staff.StaffMapper; import com.engine.organization.mapper.trigger.CompTriggerMapper; import com.engine.organization.util.OrganizationDateUtil; import com.engine.organization.util.db.MapperProxyFactory; -import org.apache.commons.collections.CollectionUtils; import weaver.common.DateUtil; -import weaver.hrm.passwordprotection.domain.HrmResource; import java.sql.Date; import java.util.Calendar; -import java.util.List; /** * @author:dxfeng @@ -52,80 +51,76 @@ public class CompanyTriggerRunnable implements Runnable { @Override public void run() { - FieldBaseEquator fieldBaseEquator = new FieldBaseEquator(); - List diffFields = fieldBaseEquator.getDiffFieldList(oldCompany, newCompany); - if (CollectionUtils.isEmpty(diffFields)) { - return; - } // 判断 - if (diffFields.contains("compName") || diffFields.contains("compPrincipal") || diffFields.contains("parentCompany") || diffFields.contains("forbiddenTag") || diffFields.contains("deleteType")) { - JclOrgMap jclMap = new JclOrgMap(); - - jclMap.setFType(1); - // 更新逻辑 - jclMap.setFObjId(newCompany.getId().intValue()); - jclMap.setId(newCompany.getId().intValue()); - jclMap.setUuid(newCompany.getUuid()); - jclMap.setFNumber(newCompany.getCompNo()); - jclMap.setFName(newCompany.getCompName()); - jclMap.setFLeader(newCompany.getCompPrincipal()); - jclMap.setFParentId(null == newCompany.getParentCompany() ? 0 : newCompany.getParentCompany().intValue()); - jclMap.setFObjParentId(null == newCompany.getParentCompany() ? 0 : newCompany.getParentCompany().intValue()); - jclMap.setFEcId(getCompTriggerMapper().getEcCompanyIdByUuid(jclMap.getUuid())); - - - jclMap.setFClass(0); - jclMap.setFClassName("行政维度"); - HrmResource hrmResourceById = getCompTriggerMapper().getHrmResourceById(jclMap.getFLeader()); - - - if (null != hrmResourceById) { - jclMap.setFLeaderImg(hrmResourceById.getMessagerurl()); - jclMap.setFLeaderName(hrmResourceById.getLastname()); - jclMap.setFLeaderJobId(hrmResourceById.getJobtitle()); + JclOrgMap jclMap = new JclOrgMap(); + + jclMap.setFType(1); + // 更新逻辑 + jclMap.setFObjId(newCompany.getId().intValue()); + jclMap.setId(newCompany.getId().intValue()); + jclMap.setUuid(newCompany.getUuid()); + jclMap.setFNumber(newCompany.getCompNo()); + jclMap.setFName(newCompany.getCompName()); + jclMap.setFParentId(null == newCompany.getParentCompany() ? 0 : newCompany.getParentCompany().intValue()); + jclMap.setFObjParentId(null == newCompany.getParentCompany() ? 0 : newCompany.getParentCompany().intValue()); + jclMap.setFEcId(getCompTriggerMapper().getEcCompanyIdByUuid(jclMap.getUuid())); + + + jclMap.setFClass(0); + jclMap.setFClassName("行政维度"); + + Integer ecResourceId = newCompany.getCompPrincipal(); + HrmResourcePO hrmResourcePO = getCompTriggerMapper().getResourceByEcId(ecResourceId); + if (null != hrmResourcePO) { + jclMap.setFLeader(hrmResourcePO.getId().intValue()); + jclMap.setFLeaderName(hrmResourcePO.getLastName()); + jclMap.setFLeaderJobId(hrmResourcePO.getJobTitle().intValue()); + jclMap.setFLeaderSt(hrmResourcePO.getJobGrade()); + jclMap.setFLeaderLv(hrmResourcePO.getJobLevel()); + String image = User.builder().image(hrmResourcePO.getResourceImageId()).build().getImage(); + jclMap.setFLeaderImg(image); + if (null != hrmResourcePO.getJobTitle()) { + JobPO jobById = MapperProxyFactory.getProxy(JobMapper.class).getJobById(hrmResourcePO.getJobTitle()); + if (null != jobById) { + jclMap.setFLeaderJob(jobById.getJobName()); + } } + } - jclMap.setFLeaderJob(getCompTriggerMapper().getJobTitleMarkById(jclMap.getFLeaderJobId())); - HrmResourcePO resourceByEcId = getCompTriggerMapper().getResourceByEcId(jclMap.getFLeader()); - if (null != resourceByEcId) { - jclMap.setFLeaderSt(resourceByEcId.getJobGrade()); - jclMap.setFLeaderLv(resourceByEcId.getJobLevel()); - } - String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); - jclMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); - jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); - - StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(jclMap.getFType(),jclMap.getFObjId().toString(),null, null); - JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(jclMap.getFDateBegin(), ModuleTypeEnum.subcompanyfielddefined.getValue().toString(), jclMap.getFObjId().toString()); - if (null != jclOrgMapByObjID) { - jclMap.setFPlan(jclOrgMapByObjID.getFPlan()); - jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob()); - } else { - jclMap.setFPlan(null != staffPO ? staffPO.getStaffNum() : 0); - jclMap.setFOnJob(0); - } - jclMap.setFIsVitual(0); + String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); + jclMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); + jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); - Calendar cal = Calendar.getInstance(); - cal.setTime(jclMap.getFDateBegin()); - Calendar calendar = DateUtil.addDay(cal, -1); - Date time = new Date(calendar.getTime().getTime()); - getCompTriggerMapper().deleteMap(jclMap.getFType(), jclMap.getFObjId(), jclMap.getFDateBegin()); - getCompTriggerMapper().updateMap(jclMap.getFType(), jclMap.getFObjId(), jclMap.getFDateBegin(), time); + StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(jclMap.getFType(), jclMap.getFObjId().toString(), null, null); + JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(jclMap.getFDateBegin(), ModuleTypeEnum.subcompanyfielddefined.getValue().toString(), jclMap.getFObjId().toString()); + if (null != jclOrgMapByObjID) { + jclMap.setFPlan(jclOrgMapByObjID.getFPlan()); + jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob()); + } else { + jclMap.setFPlan(null != staffPO ? staffPO.getStaffNum() : 0); + jclMap.setFOnJob(0); + } + jclMap.setFIsVitual(0); - if (1 != newCompany.getDeleteType() && 1 != newCompany.getForbiddenTag()) { - MapperProxyFactory.getProxy(JclOrgMapper.class).insertMap(jclMap); - } - if (null != jclOrgMapByObjID) { - if (null != jclOrgMapByObjID.getFParentId()) { - updateParentPlanAndJob(jclMap.getFDateBegin(), jclOrgMapByObjID.getFParentId().toString()); - } + Calendar cal = Calendar.getInstance(); + cal.setTime(jclMap.getFDateBegin()); + Calendar calendar = DateUtil.addDay(cal, -1); + Date time = new Date(calendar.getTime().getTime()); + getCompTriggerMapper().deleteMap(jclMap.getFType(), jclMap.getFObjId(), jclMap.getFDateBegin()); + getCompTriggerMapper().updateMap(jclMap.getFType(), jclMap.getFObjId(), jclMap.getFDateBegin(), time); + + if (1 != newCompany.getDeleteType() && 1 != newCompany.getForbiddenTag()) { + MapperProxyFactory.getProxy(JclOrgMapper.class).insertMap(jclMap); + } + if (null != jclOrgMapByObjID) { + if (null != jclOrgMapByObjID.getFParentId()) { + updateParentPlanAndJob(jclMap.getFDateBegin(), jclOrgMapByObjID.getFParentId().toString()); } - if (null != oldCompany) { - if(null != oldCompany.getId()){ - updateParentPlanAndJob(jclMap.getFDateBegin(), oldCompany.getId().toString()); - } + } + if (null != oldCompany) { + if (null != oldCompany.getId()) { + updateParentPlanAndJob(jclMap.getFDateBegin(), oldCompany.getId().toString()); } } } @@ -138,9 +133,9 @@ public class CompanyTriggerRunnable implements Runnable { if (null != parentJclOrgMap) { // 上级部门当前在编、在岗数 JclOrgMap jclOrgMapSum = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(currentDate, parentJclOrgMap.getId().toString()); - StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(parentJclOrgMap.getFType(),parentId,null, null); + StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(parentJclOrgMap.getFType(), parentId, null, null); if (null != jclOrgMapSum) { - parentJclOrgMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0 ) + jclOrgMapSum.getFPlan()); + parentJclOrgMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMapSum.getFPlan()); parentJclOrgMap.setFOnJob(jclOrgMapSum.getFOnJob()); } else { parentJclOrgMap.setFPlan(null != staffPO ? staffPO.getStaffNum() : 0); diff --git a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java index a610a42b..29f349b8 100644 --- a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java +++ b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java @@ -2,12 +2,15 @@ package com.engine.organization.thread; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.hrmresource.po.HrmResourcePO; +import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.logview.bo.FieldBaseEquator; import com.engine.organization.entity.map.JclOrgMap; +import com.engine.organization.entity.personnelcard.User; import com.engine.organization.entity.staff.po.StaffPO; import com.engine.organization.enums.ModuleTypeEnum; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.jclorgmap.JclOrgMapper; +import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.mapper.staff.StaffMapper; import com.engine.organization.mapper.trigger.CompTriggerMapper; import com.engine.organization.mapper.trigger.DepartmentTriggerMapper; @@ -16,7 +19,6 @@ import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; import weaver.common.DateUtil; import weaver.general.Util; -import weaver.hrm.passwordprotection.domain.HrmResource; import java.sql.Date; import java.util.Calendar; @@ -96,7 +98,6 @@ public class DepartmentTriggerRunnable implements Runnable { jclMap.setUuid(newDepartment.getUuid()); jclMap.setFNumber(newDepartment.getDeptNo()); jclMap.setFName(newDepartment.getDeptName()); - jclMap.setFLeader(null == newDepartment.getDeptPrincipal() ? null : newDepartment.getDeptPrincipal().intValue()); jclMap.setFParentId(null == newDepartment.getParentDept() ? newDepartment.getParentComp().intValue() : newDepartment.getParentDept().intValue() + st); jclMap.setFObjParentId(null == newDepartment.getParentDept() ? newDepartment.getParentComp().intValue() : newDepartment.getParentDept().intValue()); @@ -104,22 +105,24 @@ public class DepartmentTriggerRunnable implements Runnable { jclMap.setFClass(0); jclMap.setFClassName("行政维度"); - HrmResource hrmResourceById = getCompTriggerMapper().getHrmResourceById(jclMap.getFLeader()); - - if (null != hrmResourceById) { - jclMap.setFLeaderImg(hrmResourceById.getMessagerurl()); - jclMap.setFLeaderName(hrmResourceById.getLastname()); - jclMap.setFLeaderJobId(hrmResourceById.getJobtitle()); + Integer ecResourceId = null == newDepartment.getDeptPrincipal() ? null : newDepartment.getDeptPrincipal().intValue(); + HrmResourcePO hrmResourcePO = getCompTriggerMapper().getResourceByEcId(ecResourceId); + if (null != hrmResourcePO) { + jclMap.setFLeader(hrmResourcePO.getId().intValue()); + jclMap.setFLeaderName(hrmResourcePO.getLastName()); + jclMap.setFLeaderJobId(hrmResourcePO.getJobTitle().intValue()); + jclMap.setFLeaderSt(hrmResourcePO.getJobGrade()); + jclMap.setFLeaderLv(hrmResourcePO.getJobLevel()); + String image = User.builder().image(hrmResourcePO.getResourceImageId()).build().getImage(); + jclMap.setFLeaderImg(image); + if (null != hrmResourcePO.getJobTitle()) { + JobPO jobById = MapperProxyFactory.getProxy(JobMapper.class).getJobById(hrmResourcePO.getJobTitle()); + if (null != jobById) { + jclMap.setFLeaderJob(jobById.getJobName()); + } + } } - jclMap.setFLeaderJob(getCompTriggerMapper().getJobTitleMarkById(jclMap.getFLeaderJobId())); - - - HrmResourcePO resourceByEcId = getCompTriggerMapper().getResourceByEcId(jclMap.getFLeader()); - if (null != resourceByEcId) { - jclMap.setFLeaderSt(resourceByEcId.getJobGrade()); - jclMap.setFLeaderLv(resourceByEcId.getJobLevel()); - } String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); jclMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); @@ -127,7 +130,6 @@ public class DepartmentTriggerRunnable implements Runnable { // 获取当前生效的本部门map记录 JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(jclMap.getFDateBegin(), ModuleTypeEnum.departmentfielddefined.getValue().toString(), Util.null2String(jclMap.getFObjId())); StaffPO staffPO = new StaffPO(); -// StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(null,jclMap.getFObjId().toString(), null); switch (jclMap.getFType()) { // 分部 case 1: diff --git a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java index 4efebe36..283aa32b 100644 --- a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java +++ b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java @@ -68,7 +68,6 @@ public class HrmResourceTriggerRunnable implements Runnable { // 展示为花名册上传的照片 String image = User.builder().image(hrmResource.getResourceImageId()).build().getImage(); jclMap.setFLeaderImg(image); - // TODO 是否刷新架构图本人所有的图像 jclMap.setFLeaderName(hrmResource.getLastName()); jclMap.setFLeaderJobId(hrmResource.getJobTitle().intValue()); if (null != hrmResource.getJobTitle()) { @@ -100,16 +99,8 @@ public class HrmResourceTriggerRunnable implements Runnable { if (0 == delete) { MapperProxyFactory.getProxy(JclOrgMapper.class).insertMap(jclMap); // 更新当前架构图负责人的卡片信息 - getHrmResourceTriggerMapper().updateLeaders(currentDate, hrmResource.getId().toString(), jclMap.getFLeaderImg(), jclMap.getFLeaderName(), jclMap.getFLeaderJobId(), jclMap.getFLeaderJob(), jclMap.getFLeaderLv(), jclMap.getFLeaderSt()); + getHrmResourceTriggerMapper().updateLeaders(jclMap.getFDateBegin(), hrmResource.getId().toString(), jclMap.getFLeaderImg(), jclMap.getFLeaderName(), jclMap.getFLeaderJobId(), jclMap.getFLeaderJob(), jclMap.getFLeaderLv(), jclMap.getFLeaderSt()); // 更新组织架构图在岗数 - //if (null != jclOrgMapByObjID && !jclMap.getFObjParentId().equals(jclOrgMapByObjID.getFObjParentId())) { - // new StaffTriggerRunnable(jclOrgMapByObjID.getFObjParentId()).run(); - // new StaffTriggerRunnable(jclMap.getFObjParentId()).run(); - //} else { - // new StaffTriggerRunnable(jclMap.getFObjParentId()).run(); - //} - - if (null != jclOrgMapByObjID) { new StaffTriggerRunnable(jclOrgMapByObjID.getFObjParentId()).run(); } diff --git a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java index d8b15864..7515af01 100644 --- a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java +++ b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java @@ -138,7 +138,7 @@ public class StaffInfoImportUtil { // 分部 if ("comp_id".equals(infoPO.getFieldName())) { String[] split = cellValue.split(">"); - if (split.length > 0) { + if (split.length > 0 && StringUtils.isNotBlank(cellValue)) { if (split.length > 8) { historyDetailPO.setOperateDetail("分部层级不能大于10"); historyDetailPO.setStatus("0"); @@ -161,7 +161,7 @@ public class StaffInfoImportUtil { // 部门 if ("dept_id".equals(infoPO.getFieldName())) { String[] split = cellValue.split(">"); - if (split.length > 0) { + if (split.length > 0 && StringUtils.isNotBlank(cellValue)) { if (split.length > 8) { historyDetailPO.setOperateDetail("部门层级不能大于10"); historyDetailPO.setStatus("0"); @@ -194,7 +194,7 @@ public class StaffInfoImportUtil { continue nextRow; } String[] split = cellValue.split(">"); - if (split.length > 0) { + if (split.length > 0 && StringUtils.isNotBlank(cellValue)) { if (split.length > 8) { historyDetailPO.setOperateDetail("岗位层级不能大于10"); historyDetailPO.setStatus("0"); -- 2.40.0.windows.1