|
|
|
|
@ -2,14 +2,18 @@ package com.engine.organization.thread;
|
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
import com.engine.common.util.ServiceUtil;
|
|
|
|
|
import com.engine.hrm.service.impl.HrmJobServiceImpl;
|
|
|
|
|
import com.engine.hrm.service.impl.OrganizationServiceImpl;
|
|
|
|
|
import com.engine.organization.entity.extend.param.ExtendInfoParams;
|
|
|
|
|
import com.engine.organization.entity.job.po.JobPO;
|
|
|
|
|
import com.engine.organization.enums.LogModuleNameEnum;
|
|
|
|
|
import com.engine.organization.enums.OperateTypeEnum;
|
|
|
|
|
import com.engine.organization.mapper.extend.ExtMapper;
|
|
|
|
|
import com.engine.organization.mapper.hrmresource.SystemDataMapper;
|
|
|
|
|
import com.engine.organization.mapper.job.JobMapper;
|
|
|
|
|
import com.engine.organization.util.db.MapperProxyFactory;
|
|
|
|
|
import com.engine.organization.util.relation.EcHrmRelationUtil;
|
|
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
|
|
import weaver.general.Util;
|
|
|
|
|
import weaver.hrm.User;
|
|
|
|
|
@ -18,6 +22,7 @@ import java.util.ArrayList;
|
|
|
|
|
import java.util.HashMap;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @author:dxfeng
|
|
|
|
|
@ -29,6 +34,7 @@ public class OrganizationRunable implements Runnable {
|
|
|
|
|
private OperateTypeEnum operateType;
|
|
|
|
|
private Map<String, Object> params;
|
|
|
|
|
private User user;
|
|
|
|
|
private JobPO oldJobPO;
|
|
|
|
|
|
|
|
|
|
private static final String HRM_COMPANY = "hrmsubcompany";
|
|
|
|
|
private static final String HRM_DEPARTMENT = "hrmdepartment";
|
|
|
|
|
@ -51,6 +57,15 @@ public class OrganizationRunable implements Runnable {
|
|
|
|
|
this.user = user;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public OrganizationRunable(User user, LogModuleNameEnum moduleName, OperateTypeEnum operateType, Map<String, Object> params, JobPO oldJobPO) {
|
|
|
|
|
this.moduleName = moduleName;
|
|
|
|
|
this.operateType = operateType;
|
|
|
|
|
this.params = params;
|
|
|
|
|
this.user = user;
|
|
|
|
|
this.oldJobPO = oldJobPO;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void run() {
|
|
|
|
|
switch (moduleName) {
|
|
|
|
|
@ -109,16 +124,157 @@ public class OrganizationRunable implements Runnable {
|
|
|
|
|
private void refreshJob() {
|
|
|
|
|
switch (operateType) {
|
|
|
|
|
case ADD:
|
|
|
|
|
addJob();
|
|
|
|
|
break;
|
|
|
|
|
case UPDATE:
|
|
|
|
|
updateJob();
|
|
|
|
|
break;
|
|
|
|
|
case DELETE:
|
|
|
|
|
case CANCELED:
|
|
|
|
|
cancelJob();
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 新增岗位
|
|
|
|
|
*
|
|
|
|
|
* <p>
|
|
|
|
|
* 1、EC表HrmJobTitles
|
|
|
|
|
* <p>
|
|
|
|
|
* 2、系统中新建“聚才林”、“默认职务”（sql写入）
|
|
|
|
|
* <p>
|
|
|
|
|
* 3、检索岗位名称jobtitlename，如果已存在，判断是否封存，对已封存数据解封操作
|
|
|
|
|
* <p>
|
|
|
|
|
* 4、如果不存在，在“聚才林--默认职务”下新建岗位
|
|
|
|
|
*/
|
|
|
|
|
private void addJob() {
|
|
|
|
|
// 判断是否存在同名岗位、存在不做处理，不存在，在“默认职务分类--默认职务”下新建岗位
|
|
|
|
|
String jobName = Util.null2String(params.get("job_name"));
|
|
|
|
|
JSONObject hrmJobActivity = getSystemDataMapper().getHrmJobTitleByName(jobName);
|
|
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
|
//存在且已封存，对岗位解封
|
|
|
|
|
if (null != hrmJobActivity && "1".equals(hrmJobActivity.getString("canceled"))) {
|
|
|
|
|
map.put("ids", hrmJobActivity.getString("id"));
|
|
|
|
|
map.put("canceled", "docanceled");
|
|
|
|
|
ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user);
|
|
|
|
|
} else {
|
|
|
|
|
// 不存在则新建职务
|
|
|
|
|
map.put("operateIp", Util.null2String(user.getLoginip()));
|
|
|
|
|
map.put("jobtitlemark", jobName);
|
|
|
|
|
map.put("jobtitlename", jobName);
|
|
|
|
|
map.put("jobactivityid", Util.null2String(params.get("jobactivityid")));
|
|
|
|
|
map.put("jobresponsibility", Util.null2String(params.get("work_duty")));
|
|
|
|
|
map.put("jobcompetency", Util.null2String(params.get("work_authority")));
|
|
|
|
|
map.put("jobtitleremark", Util.null2String(params.get("description")));
|
|
|
|
|
map.put("jobtitlecode", Util.null2String(params.get("job_no")));
|
|
|
|
|
|
|
|
|
|
ServiceUtil.getService(HrmJobServiceImpl.class, user).addJobTitle(map, user);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 更新岗位
|
|
|
|
|
*/
|
|
|
|
|
private void updateJob() {
|
|
|
|
|
Long jclJobId = oldJobPO.getId();
|
|
|
|
|
String oldName = oldJobPO.getJobName();
|
|
|
|
|
|
|
|
|
|
String newName = Util.null2String(params.get("job_name"));
|
|
|
|
|
JSONObject oldHrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(oldName);
|
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
|
// 修改前不存在共用
|
|
|
|
|
if (EcHrmRelationUtil.isNotExistJob(oldName, jclJobId)) {
|
|
|
|
|
// 修改后不存在共用、直接修改EC岗位表数据
|
|
|
|
|
if (EcHrmRelationUtil.isNotExistJob(newName, jclJobId)) {
|
|
|
|
|
// 查询ec表ID
|
|
|
|
|
JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(oldName);
|
|
|
|
|
map.put("id", Util.null2String(hrmJobTitle.get("id")));
|
|
|
|
|
map.put("operateIp", Util.null2String(user.getLoginip()));
|
|
|
|
|
map.put("jobtitlemark", newName);
|
|
|
|
|
map.put("jobtitlename", newName);
|
|
|
|
|
map.put("jobactivityid", Util.null2String(params.get("jobactivityid")));
|
|
|
|
|
map.put("jobresponsibility", Util.null2String(params.get("work_duty")));
|
|
|
|
|
map.put("jobcompetency", Util.null2String(params.get("work_authority")));
|
|
|
|
|
map.put("jobtitleremark", Util.null2String(params.get("description")));
|
|
|
|
|
map.put("jobtitlecode", Util.null2String(params.get("job_no")));
|
|
|
|
|
// 修改岗位表数据
|
|
|
|
|
ServiceUtil.getService(HrmJobServiceImpl.class, user).editJobTitle(map, user);
|
|
|
|
|
} else {
|
|
|
|
|
// 修改后存在共用、不修改岗位表数据，更新对应人员的岗位信息为当前岗位的ID
|
|
|
|
|
JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName);
|
|
|
|
|
// 查询原分部、原岗位下的人员，并更新岗位ID
|
|
|
|
|
List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getString("id"));
|
|
|
|
|
getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.get("id")), hrmResourceIds);
|
|
|
|
|
// 封存原名称岗位
|
|
|
|
|
map.clear();
|
|
|
|
|
map.put("ids", oldHrmJobTitle.getString("id"));
|
|
|
|
|
map.put("canceled", "canceled");
|
|
|
|
|
ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// 修改前存在共用，不对原有数据进行操作。
|
|
|
|
|
|
|
|
|
|
// 修改后不存在共用、新建岗位，更新原有岗位下人员的岗位ID
|
|
|
|
|
if (EcHrmRelationUtil.isNotExistJob(newName, jclJobId)) {
|
|
|
|
|
// 不存在则新建职务
|
|
|
|
|
map.put("operateIp", Util.null2String(user.getLoginip()));
|
|
|
|
|
map.put("jobtitlemark", newName);
|
|
|
|
|
map.put("jobtitlename", newName);
|
|
|
|
|
map.put("jobactivityid", Util.null2String(params.get("jobactivityid")));
|
|
|
|
|
map.put("jobresponsibility", Util.null2String(params.get("work_duty")));
|
|
|
|
|
map.put("jobcompetency", Util.null2String(params.get("work_authority")));
|
|
|
|
|
map.put("jobtitleremark", Util.null2String(params.get("description")));
|
|
|
|
|
map.put("jobtitlecode", Util.null2String(params.get("job_no")));
|
|
|
|
|
ServiceUtil.getService(HrmJobServiceImpl.class, user).addJobTitle(map, user);
|
|
|
|
|
// 新建岗位
|
|
|
|
|
JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName);
|
|
|
|
|
// 查询原分部、原岗位下的人员，并更新岗位ID
|
|
|
|
|
List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getString("id"));
|
|
|
|
|
getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.get("id")), hrmResourceIds);
|
|
|
|
|
} else {
|
|
|
|
|
// 修改后存在共用，更新原有岗位下人员的岗位ID
|
|
|
|
|
JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName);
|
|
|
|
|
// 查询原分部、原岗位下的人员，并更新岗位ID
|
|
|
|
|
List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getString("id"));
|
|
|
|
|
getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.get("id")), hrmResourceIds);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 封存、解封岗位
|
|
|
|
|
*/
|
|
|
|
|
private void cancelJob() {
|
|
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
|
JSONObject hrmJobTitleByName = getSystemDataMapper().getHrmJobTitleByName(oldJobPO.getJobName());
|
|
|
|
|
if (0 == oldJobPO.getForbiddenTag()) {
|
|
|
|
|
// 启用
|
|
|
|
|
map.put("ids", hrmJobTitleByName.getString("id"));
|
|
|
|
|
map.put("canceled", "docanceled");
|
|
|
|
|
ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user);
|
|
|
|
|
} else {
|
|
|
|
|
// 禁用
|
|
|
|
|
List<JobPO> jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listByNameExceptId(oldJobPO.getJobName(), oldJobPO.getId());
|
|
|
|
|
// 不存在共用
|
|
|
|
|
if (CollectionUtils.isEmpty(jobPOS)) {
|
|
|
|
|
map.put("ids", hrmJobTitleByName.getString("id"));
|
|
|
|
|
map.put("canceled", "canceled");
|
|
|
|
|
ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user);
|
|
|
|
|
} else {
|
|
|
|
|
List<JobPO> collect = jobPOS.stream().filter(item -> 0 == item.getForbiddenTag()).collect(Collectors.toList());
|
|
|
|
|
// 不存在非禁用
|
|
|
|
|
if (CollectionUtils.isEmpty(collect)) {
|
|
|
|
|
map.put("ids", hrmJobTitleByName.getString("id"));
|
|
|
|
|
map.put("canceled", "canceled");
|
|
|
|
|
ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 新增部门
|
|
|
|
|
*/
|
|
|
|
|
@ -278,8 +434,8 @@ public class OrganizationRunable implements Runnable {
|
|
|
|
|
String uuid = hrmDepartment.getString("uuid");
|
|
|
|
|
Map<String, Object> departmentMap = new HashMap<>();
|
|
|
|
|
departmentMap.put("uuid", uuid);
|
|
|
|
|
long departmentId = Long.parseLong(Util.null2String(params.get("id")));
|
|
|
|
|
ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName(jclTableName).params(departmentMap).id(departmentId).build();
|
|
|
|
|
long jclTableId = Long.parseLong(Util.null2String(params.get("id")));
|
|
|
|
|
ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName(jclTableName).params(departmentMap).id(jclTableId).build();
|
|
|
|
|
getExtMapper().updateExt(infoParams);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
Gitee