liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!244 BUG修复 

Merge pull request !244 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-09-20 02:25:53 +00:00 committed by Gitee
parent abf5840f72 2632f6c857
commit 7d99eb0a3a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
12 changed files with 135 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/api/browser/service/impl/JobBrowserService.java
View File

@ -63,7 +63,8 @@ public class JobBrowserService extends BrowserService {
searchTreeParams.setId(idArray[1]);
Map<String, Object> searchTree = new JobServiceImpl().getSearchTree(searchTreeParams);
List<TreeNode> datas = (List<TreeNode>) searchTree.get("datas");
nodeData.addAll(datas.get(0).getSubs());
TreeNode treeNode = datas.stream().filter(item -> idArray[1].equals(item.getId())).findFirst().orElse(new TreeNode());
nodeData.addAll(treeNode.getSubs());
}
}
List<CusBrowserTree> cusBrowserTrees = CusBowserTreeBO.convertSearchTreeToBorwserTree(nodeData);

2
src/com/engine/organization/entity/job/bo/JobBO.java
View File

@ -98,6 +98,8 @@ public class JobBO {
Map<Long, List<JobListDTO>> collects = dtoList.stream().filter(item -> null != item.getParentJob() && 0 != item.getParentJob()).collect(Collectors.groupingBy(JobListDTO::getParentJob));
// 处理被引用数据
List<String> usedIds = MapperProxyFactory.getProxy(JobMapper.class).listUsedId();
// 兼容不同类型
usedIds.addAll(MapperProxyFactory.getProxy(JobMapper.class).getCusJobIds());
List<String> collect = Arrays.stream(String.join(",", usedIds).split(",")).collect(Collectors.toList());
return dtoList.stream().peek(e -> {
List<JobListDTO> childList = collects.get(e.getId());

8
src/com/engine/organization/mapper/job/JobMapper.java
View File

@ -136,6 +136,14 @@ public interface JobMapper {
*/
List<String> listUsedId();
/**
* EC人员使用的聚才林岗位
* @return
*/
List<String> getCusJobIds();
/**
* 获取最大排序
*

8
src/com/engine/organization/mapper/job/JobMapper.xml
View File

@ -317,6 +317,8 @@
job_name=#{jobName},
parent_comp=#{parentComp},
parent_dept=#{parentDept},
ec_company=#{ecCompany},
ec_department=#{ecDepartment},
sequence_id=#{sequenceId},
scheme_id=#{schemeId},
parent_job=#{parentJob},
@ -540,6 +542,12 @@
and t.id != #{id}
</if>
</select>
<select id="getCusJobIds" resultType="java.lang.String">
SELECT FIELD100002
FROM CUS_FIELDDATA
WHERE SCOPE = 'HrmCustomFieldByInfoType'
AND SCOPEID = -1
</select>
<sql id="nullparentJob">
and ifnull(parent_job,0) =

1
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
View File

@ -699,6 +699,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
deptById.setEcCompany(company);
deptById.setParentComp(Objects.requireNonNull(EcHrmRelationUtil.getJclCompanyId(Util.null2String(company))).getId());
deptById.setParentDept(null);
deptById.setEcDepartment(null);
} else if ("1".equals(moveParam.getMoveType())) {
Long department = moveParam.getDepartment();
Long departmentId = Objects.requireNonNull(EcHrmRelationUtil.getJclDepartmentId(Util.null2String(department))).getId();

4
src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
View File

@ -815,7 +815,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
if (StringUtils.isNotBlank(cellValue) && StringUtils.isBlank(Util.null2String(reallyValue)) && !"parent_comp".equals(infoPO.getFieldName())) {
if (StringUtils.isNotBlank(cellValue) && StringUtils.isBlank(Util.null2String(reallyValue)) && !"ec_company".equals(infoPO.getFieldName())) {
historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "数据转换失败,未找到对应数据");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
@ -1072,7 +1072,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
}
for (String s : split) {
parentDepartmentId = MapperProxyFactory.getProxy(DepartmentMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId);
if (null == parentCompanyId) {
if (null == parentDepartmentId) {
historyDetailPO.setOperateDetail(cellValue + "部门未找到对应数据");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);

9
src/com/engine/organization/service/impl/JobServiceImpl.java
View File

@ -539,11 +539,11 @@ public class JobServiceImpl extends Service implements JobService {
// 人员信息变动，更新分部、部门、岗位
RecordSet rs = new RecordSet();
rs.executeUpdate("SELECT ID FROM CUS_FIELDDATA WHERE SCOPEID =-1 AND FIELD100002 = ?", jobById.getId());
rs.execute("SELECT ID FROM CUS_FIELDDATA WHERE SCOPE = 'HrmCustomFieldByInfoType' AND SCOPEID =-1 AND FIELD100002 = '" + jobById.getId() + "'");
while (rs.next()) {
long userId = Long.parseLong(Util.null2String(rs.getString("ID")));
// 更新岗位 、岗位更新触发器
rs.executeUpdate("update CUS_FIELDDATA set FIELD100002 = ? where SCOPEID =-1 and id = ", targetJob.getId(), userId);
rs.executeUpdate("update CUS_FIELDDATA set FIELD100002 = ? where SCOPE = 'HrmCustomFieldByInfoType' AND SCOPEID =-1 and id = ?", targetJob.getId(), userId);
CusFieldDataTrigger.run(userId);
// 更新人员组织架构图
}
@ -569,13 +569,14 @@ public class JobServiceImpl extends Service implements JobService {
job.setParentDept(parentDepartment);
job.setEcDepartment(ecDepartment);
job.setParentJob(parentJob);
getJobMapper().updateBaseJob(job);
// 更新人员信息
RecordSet rs = new RecordSet();
rs.executeUpdate("SELECT ID FROM CUS_FIELDDATA WHERE SCOPEID =-1 AND FIELD100002 = ?", job.getId());
rs.execute("SELECT ID FROM CUS_FIELDDATA WHERE SCOPE = 'HrmCustomFieldByInfoType' AND SCOPEID =-1 AND FIELD100002 = '" + job.getId() + "'");
while (rs.next()) {
long userId = Long.parseLong(Util.null2String(rs.getString("ID")));
// 更新人员分部、部门
rs.executeUpdate("UPDATE HRMRESOURCE SET SUBCOMPANYID1 = ? , DEPARTMENTID = ? WHERE ID =? ", ecCompany, ecDepartment, userId);
// rs.executeUpdate("UPDATE HRMRESOURCE SET SUBCOMPANYID1 = ? , DEPARTMENTID = ? WHERE ID =? ", ecCompany, ecDepartment, userId);
// 更新人员组织架构图
CusFieldDataTrigger.run(userId);
}

36
src/com/engine/organization/thread/OrganizationSyncEc.java
View File

@ -205,17 +205,31 @@ public class OrganizationSyncEc {
if (EcHrmRelationUtil.isNotExistJob(newName, jclJobId)) {
// 查询ec表ID
RecordInfo hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(oldName);
map.put("id", Util.null2String(hrmJobTitle.getId()));
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")) + "_" + System.currentTimeMillis());
// 修改岗位表数据
this.resultMap = ServiceUtil.getService(HrmJobServiceImpl.class, user).editJobTitle(map, user);
if (null != hrmJobTitle) {
map.put("id", Util.null2String(hrmJobTitle.getId()));
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")) + "_" + System.currentTimeMillis());
// 修改岗位表数据
this.resultMap = ServiceUtil.getService(HrmJobServiceImpl.class, user).editJobTitle(map, user);
} else {
// TODO 纠正错误数据 临时使用
// 不存在则新建职务
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")) + "_" + System.currentTimeMillis());
this.resultMap = ServiceUtil.getService(HrmJobServiceImpl.class, user).addJobTitle(map, user);
}
} else {
// 修改后存在共用、不修改岗位表数据，更新对应人员的岗位信息为当前岗位的ID
RecordInfo hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName);

63
src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java
View File

@ -21,6 +21,7 @@ import com.engine.organization.mapper.scheme.SchemeMapper;
import com.engine.organization.mapper.sequence.SequenceMapper;
import com.engine.organization.thread.HrmResourceTriggerRunnable;
import com.engine.organization.util.db.MapperProxyFactory;
import com.wbi.util.Util;
import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
@ -64,23 +65,53 @@ public class CusFieldDataTrigger {
directionData.setField100002(sourceField100002);
Long gwId = Long.parseLong(sourceField100002);
JobPO jobById = MapperProxyFactory.getProxy(JobMapper.class).getJobById(gwId);
RecordInfo hrmJobTitleByName = MapperProxyFactory.getProxy(SystemDataMapper.class).getHrmJobTitleByName(jobById.getJobName());
Long ecGwId = StringUtils.isNotBlank(hrmJobTitleByName.getId()) ? Long.parseLong(hrmJobTitleByName.getId()) : null;
Long ecBmId = jobById.getEcDepartment();
Long ecGsId = jobById.getEcCompany();
Map<String, Object> hrmResourceMap = new HashMap<>();
// 岗位
hrmResourceMap.put("jobtitle", ecGwId);
// 部门
hrmResourceMap.put("departmentid", ecBmId);
// 公司
hrmResourceMap.put("subcompanyid1", ecGsId);
MapperProxyFactory.getProxy(ExtMapper.class).updateTable(ExtendInfoParams.builder().id(id).tableName("hrmresource").params(hrmResourceMap).build());
updateFlag = true;
if (null != jobById) {
RecordInfo hrmJobTitleByName = MapperProxyFactory.getProxy(SystemDataMapper.class).getHrmJobTitleByName(jobById.getJobName());
Long ecGwId = StringUtils.isNotBlank(hrmJobTitleByName.getId()) ? Long.parseLong(hrmJobTitleByName.getId()) : null;
Long ecBmId = jobById.getEcDepartment();
Long ecGsId = jobById.getEcCompany();
Map<String, Object> hrmResourceMap = new HashMap<>();
// 岗位
hrmResourceMap.put("jobtitle", ecGwId);
// 部门
hrmResourceMap.put("departmentid", ecBmId);
// 公司
hrmResourceMap.put("subcompanyid1", ecGsId);
MapperProxyFactory.getProxy(ExtMapper.class).updateTable(ExtendInfoParams.builder().id(id).tableName("hrmresource").params(hrmResourceMap).build());
updateFlag = true;
if(StringUtils.isBlank(sourceField100001)){
// 拼接Field100001字段,岗位序列A职级A职等
sourceField100001 += "_" + jobById.getSequenceId() + "A" + jobById.getGradeId() + "A" + jobById.getLevelId().split(",")[0];
// 职等职级为空，从岗位取值、更新
if (StringUtils.isBlank(sourceField100001)) {
if (StringUtils.isNotBlank(jobById.getLevelId())) {
// 通过岗位关联，如有多个职等，选取第一个
String[] levelArray = jobById.getLevelId().split(",");
LevelPO levelByID = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByID(Long.parseLong(levelArray[0]));
directionData.setField100008(levelByID.getLevelName());
} else {
directionData.setField100008(null);
}
// 职等职级方案
if (StringUtils.isNotBlank(Util.null2String(jobById.getSchemeId()))) {
SchemePO schemeByID = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByID(jobById.getSchemeId());
directionData.setField100006(schemeByID.getSchemeName());
} else {
directionData.setField100006(null);
}
// 职级
if (StringUtils.isNotBlank(jobById.getGradeId())) {
GradePO gradeByLevelId = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(Long.parseLong(jobById.getGradeId()));
directionData.setField100007(gradeByLevelId.getGradeName());
} else {
directionData.setField100007(null);
}
// 岗位序列
if (StringUtils.isNotBlank(Util.null2String(jobById.getSequenceId()))) {
SequencePO sequenceBySchemeId = MapperProxyFactory.getProxy(SequenceMapper.class).getSequenceByID(jobById.getSequenceId());
directionData.setField100005(sequenceBySchemeId.getSequenceName());
} else {
directionData.setField100005(null);
}
}
}
}

2
src/com/engine/organization/util/saveimport/OrgImportUtil.java
View File

@ -37,7 +37,7 @@ public class OrgImportUtil {
}
public static void saveImportDetailLog(JclImportHistoryDetailPO historyDetailPO) {
String detailMsg = "导入第" + historyDetailPO.getRowNums() + "行数据,[" + historyDetailPO.getRelatedName() + "]" + historyDetailPO.getOperateDetail();
String detailMsg = "导入第" + historyDetailPO.getRowNums() + "行数据," + historyDetailPO.getRelatedName() + historyDetailPO.getOperateDetail();
historyDetailPO.setOperateDetail(detailMsg);
MapperProxyFactory.getProxy(JclImportHistoryDetailMapper.class).insertHistoryDetail(historyDetailPO);
}

25
src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
View File

@ -124,9 +124,10 @@ public class StaffInfoImportUtil {
List<StaffPlanPO> staffPlanPOS = MapperProxyFactory.getProxy(StaffPlanMapper.class).listByNo(Util.null2String(reallyValue));
if (CollectionUtils.isNotEmpty(staffPlanPOS)) {
staffPlanPO = staffPlanPOS.get(0);
map.put("plan_id",staffPlanPO.getId());
map.put("plan_id", staffPlanPO.getId());
historyDetailPO.setRelatedName(staffPlanPO.getPlanNo());
} else {
historyDetailPO.setRelatedName("");
historyDetailPO.setOperateDetail("编号:" + reallyValue + ",未找到对应数据");
historyDetailPO.setStatus("0");
OrgImportUtil.saveImportDetailLog(historyDetailPO);
@ -169,7 +170,7 @@ public class StaffInfoImportUtil {
}
for (String s : split) {
parentDepartmentId = MapperProxyFactory.getProxy(DepartmentMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId);
if (null == parentCompanyId) {
if (null == parentDepartmentId) {
historyDetailPO.setOperateDetail(cellValue + "部门未找到对应数据");
historyDetailPO.setStatus("0");
OrgImportUtil.saveImportDetailLog(historyDetailPO);
@ -213,6 +214,15 @@ public class StaffInfoImportUtil {
map.put("job_id", parentJobId);
}
// 编制数大于0
if ("staff_num".equals(infoPO.getFieldName()) && Integer.parseInt(Util.null2String(reallyValue)) < 0) {
historyDetailPO.setOperateDetail("编制数不可小于0");
historyDetailPO.setStatus("0");
OrgImportUtil.saveImportDetailLog(historyDetailPO);
continue nextRow;
}
}
}
// 校验、数据交互
@ -226,6 +236,7 @@ public class StaffInfoImportUtil {
OrgImportUtil.saveImportDetailLog(historyDetailPO);
continue;
}
StaffSearchParam param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), StaffSearchParam.class);
String controlDimension = staffPlanPO.getControlDimension();
String checkMsg = "";
switch (controlDimension) {
@ -233,6 +244,9 @@ public class StaffInfoImportUtil {
if (null == parentCompanyId) {
checkMsg = "编制维度选择分部时，分部必填！";
}
// 取消部门、岗位赋值
param.setDeptId(null);
param.setJobId(null);
break;
case "2":// 部门
if (null == parentCompanyId) {
@ -240,6 +254,8 @@ public class StaffInfoImportUtil {
} else if (null == parentDepartmentId) {
checkMsg = "编制维度选择部门时，部门必填！";
}
// 取消岗位赋值
param.setJobId(null);
break;
case "3": // 岗位
if (null == parentCompanyId) {
@ -254,16 +270,15 @@ public class StaffInfoImportUtil {
checkMsg = "编制方案数据有误，请确认";
break;
}
if(StringUtils.isNotBlank(checkMsg)){
if (StringUtils.isNotBlank(checkMsg)) {
historyDetailPO.setOperateDetail(checkMsg);
historyDetailPO.setStatus("0");
OrgImportUtil.saveImportDetailLog(historyDetailPO);
continue;
}
StaffSearchParam param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), StaffSearchParam.class);
StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID());
if(null==staffPO.getControlPolicy()){
if (null == staffPO.getControlPolicy()) {
staffPO.setControlPolicy(1);
}
MapperProxyFactory.getProxy(StaffMapper.class).insertIgnoreNull(staffPO);

25
src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java
View File

@ -846,6 +846,7 @@ public class HrmImportProcessE9 extends BaseBean {
if (this.checkInfo(vo, resultList)) {
continue;
}
new BaseBean().writeLog("checkKeys校验通过");
if (vo.getAccounttype() == null || "".equalsIgnoreCase(Util.null2String(vo.getAccounttype()))) {
if (StringUtil.isNotNull(vo.getCertificatenum()) && certificateNums.get(StringUtil.vString(vo.getCertificatenum())) != null) {
@ -1005,6 +1006,7 @@ public class HrmImportProcessE9 extends BaseBean {
// hrm.setJobtitle(jobtitleid);
//}
new BaseBean().writeLog("hrmId【" + hrmId + "】");
if (Util.getIntValue(hrmId) < 0) continue;
//上级id
@ -1418,6 +1420,7 @@ public class HrmImportProcessE9 extends BaseBean {
String nowmanagerstr = Util.null2String(recordSet.getString("managerstr"));
String resourceid = recordSet.getString("id");
//指定上级为自身的情况，不更新自身上级
new BaseBean().writeLog("resourceid【" + resourceid + "】");
if (hrmId.equals(resourceid))
continue;
String nowmanagerstr2 = "";
@ -1767,7 +1770,8 @@ public class HrmImportProcessE9 extends BaseBean {
if (!recordSet.next()) {
return !addPersonData(personFild, personValue, id);
}
new BaseBean().writeLog("personValue【" + personValue + "】");
new BaseBean().writeLog("personFild【" + personFild + "】");
String[] personValues = personValue.split(";");
String[] personFields = personFild.split(",");
String fielddbType;
@ -2077,14 +2081,14 @@ public class HrmImportProcessE9 extends BaseBean {
return currentId;
}
/**
* 获取岗位id
*
* @param jobtitlename 岗位名称
* @param jobactivityname 职务
* @param jobgroupname 职务类别
* @return -1:职务类别不存在，-2：职务不存在，-3：岗位名称不存在
*/
///**
// * 获取岗位id
// *
// * @param jobtitlename 岗位名称
// * @param jobactivityname 职务
// * @param jobgroupname 职务类别
// * @return -1:职务类别不存在，-2：职务不存在，-3：岗位名称不存在
// */
//public int getJobTitles(String jobtitlename, String jobactivityname,
// String jobgroupname) {
// RecordSet rs = new RecordSet();
@ -2139,8 +2143,6 @@ public class HrmImportProcessE9 extends BaseBean {
// }
// return jobtitle;
//}
public static boolean needCheckLicenseForUpdate(ResourceComInfo resourceComInfo, String hrmId, HrmResourceVo vo) {
String statusOfHrmId = resourceComInfo.getStatus(hrmId);
String loginidOfHrmId = resourceComInfo.getLoginID(hrmId);
@ -2604,6 +2606,7 @@ public class HrmImportProcessE9 extends BaseBean {
private boolean checkInfo(HrmResourceVo hrmResourceVo, List<ImportLog> resultList) {
//新增账号、工号唯一性校验
new BaseBean().writeLog("checkKeys【" + Arrays.toString(checkKeys) + "】");
for (String key : checkKeys) {
Map<String, String> checkInfo = checkInfos.get(key);
if (checkInfo != null && !checkInfo.isEmpty()) {