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

导入BUG

Browse Source
pull/232/MERGE^2
dxfeng 3 years ago
parent 59f76c012c
commit 91a8ad0bd3
4 changed files with 66 additions and 61 deletions
Show Stats Download Patch File Download Diff File

3
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
Unescape Escape View File

@ -549,6 +549,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
@Override @Override
public int mergeDepartment(DepartmentMergeParam mergeParam) { public int mergeDepartment(DepartmentMergeParam mergeParam) {
//TODO 逻辑重写，被合并部门，子元素全部转移。被合并部门删除、封存
HasRightUtil.hasRight(user, RIGHT_NAME, false); HasRightUtil.hasRight(user, RIGHT_NAME, false);
int updateCount; int updateCount;
Long ecParamDepartment = mergeParam.getDepartment(); Long ecParamDepartment = mergeParam.getDepartment();
@ -568,7 +569,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
} }
OrganizationAssert.isFalse(disableIds.contains(targetDepartment.getId()), "请勿选择当前部门本身及其子部门"); OrganizationAssert.isFalse(disableIds.contains(targetDepartment.getId()), "请勿选择当前部门本身及其子部门");
// 所选部门 //TODO 被合并部门
DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId()); DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId());
mergeDepartment.setDeptName(mergeParam.getMergeName()); mergeDepartment.setDeptName(mergeParam.getMergeName());
mergeDepartment.setDeptNameShort(mergeParam.getMergeName()); mergeDepartment.setDeptNameShort(mergeParam.getMergeName());

2
src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
Unescape Escape View File

@ -155,7 +155,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
// TODO 分部、部门 // TODO 分部、部门
List<FieldTypeTreeParam> fieldDatas = mergeList.stream().map(item -> FieldTypeTreeParam.builder().id(item.getFieldId()).name(item.getFieldLabel()).build()).collect(Collectors.toList()); List<FieldTypeTreeParam> fieldDatas = mergeList.stream().map(item -> FieldTypeTreeParam.builder().id(item.getFieldId()).name(item.getFieldLabel()).build()).collect(Collectors.toList());
List<Long> selectedKeys = mergeList.stream().filter(item -> ("1".equals(item.getRequired()) || "subcompanyid1".equals(item.getFieldName()) || "departmentid".equals(item.getFieldName()))).map(CusFormFieldPO::getFieldId).collect(Collectors.toList()); List<Long> 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("data", fieldDatas);
returnMaps.put("selectedKeys", selectedKeys); returnMaps.put("selectedKeys", selectedKeys);

3
src/com/engine/organization/service/impl/JobServiceImpl.java
Unescape Escape View File

@ -474,9 +474,10 @@ public class JobServiceImpl extends Service implements JobService {
@Override @Override
public int mergeJob(JobMergeParam mergeParam) { public int mergeJob(JobMergeParam mergeParam) {
//TODO 人员合并
HasRightUtil.hasRight(user, RIGHT_NAME, false); HasRightUtil.hasRight(user, RIGHT_NAME, false);
int updateCount; int updateCount;
OrganizationAssert.notNull(mergeParam.getTargetJob(), "请选择需要合并的部门"); OrganizationAssert.notNull(mergeParam.getTargetJob(), "请选择需要合并的岗位");
Set<Long> disableIds = new HashSet<>(); Set<Long> disableIds = new HashSet<>();
disableIds.add(mergeParam.getId()); disableIds.add(mergeParam.getId());
List<JobPO> jobs = getJobMapper().getJobsByPid(mergeParam.getId()); List<JobPO> jobs = getJobMapper().getJobsByPid(mergeParam.getId());

119
src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java
Unescape Escape View File

@ -426,26 +426,29 @@ public class HrmImportProcessE9 extends BaseBean {
hrm.setAccounttype(0); hrm.setAccounttype(0);
} }
// 岗位id //// 岗位id
if (vo.getJobtitle() != null && vo.getJobactivityid() != null && vo.getJobgroupid() != null) { //if (vo.getJobtitle() != null && vo.getJobactivityid() != null && vo.getJobgroupid() != null) {
int jobtitle = getJobTitles(vo.getJobtitle(), vo // int jobtitle = getJobTitles(vo.getJobtitle(), vo
.getJobactivityid(), vo.getJobgroupid()); // .getJobactivityid(), vo.getJobgroupid());
/// -1:职务类别不存在，-2：职务不存在，-3：职务类别不存在 // /// -1:职务类别不存在，-2：职务不存在，-3：职务类别不存在
if (jobtitle == -1) { // if (jobtitle == -1) {
resultList.add(createLog(vo, "创建", "失败", "职务类别不存在")); // resultList.add(createLog(vo, "创建", "失败", "职务类别不存在"));
continue; // continue;
} else if (jobtitle == -2) { // } else if (jobtitle == -2) {
resultList.add(createLog(vo, "创建", "失败", "职务不存在")); // resultList.add(createLog(vo, "创建", "失败", "职务不存在"));
continue; // continue;
} else if (jobtitle == -3) { // } else if (jobtitle == -3) {
resultList.add(createLog(vo, "创建", "失败", "岗位名称不存在")); // resultList.add(createLog(vo, "创建", "失败", "岗位名称不存在"));
continue; // continue;
} // }
hrm.setJobtitle(jobtitle); // hrm.setJobtitle(jobtitle);
} else { //} else {
resultList.add(createLog(vo, "创建", "失败", SystemEnv.getHtmlLabelName(83531, userlanguage))); // resultList.add(createLog(vo, "创建", "失败", SystemEnv.getHtmlLabelName(83531, userlanguage)));
continue; // continue;
} //}
// 担任岗位字段校验
//上级id //上级id
if (vo.getManagerid() != null) { if (vo.getManagerid() != null) {
@ -963,44 +966,44 @@ public class HrmImportProcessE9 extends BaseBean {
} }
} }
// 岗位id //// 岗位id
if ("".equals(Util.null2String(vo.getJobtitle())) && (!"".equals(Util.null2String(vo.getJobactivityid())) || !"".equals(Util.null2String(vo.getJobgroupid())))) { //if ("".equals(Util.null2String(vo.getJobtitle())) && (!"".equals(Util.null2String(vo.getJobactivityid())) || !"".equals(Util.null2String(vo.getJobgroupid())))) {
resultList.add(createLog(vo, "更新", "失败", SystemEnv.getHtmlLabelName(83544, userlanguage))); // resultList.add(createLog(vo, "更新", "失败", SystemEnv.getHtmlLabelName(83544, userlanguage)));
continue; // continue;
} //}
if (!"".equals(Util.null2String(vo.getJobtitle()))) { //if (!"".equals(Util.null2String(vo.getJobtitle()))) {
String jobtitle; // String jobtitle;
String jobactivityid; // String jobactivityid;
String jobactivityname; // String jobactivityname;
String jobgroupid; // String jobgroupid;
String jobgroupname; // String jobgroupname;
if (vo.getJobactivityid() == null) { // if (vo.getJobactivityid() == null) {
jobtitle = resourcecominfo.getJobTitle(hrmId); // jobtitle = resourcecominfo.getJobTitle(hrmId);
jobactivityid = jobTitlesComInfo.getJobactivityid(jobtitle); // jobactivityid = jobTitlesComInfo.getJobactivityid(jobtitle);
jobactivityname = jobActivitiesComInfo.getJobActivitiesname(jobactivityid); // jobactivityname = jobActivitiesComInfo.getJobActivitiesname(jobactivityid);
} else // } else
jobactivityname = vo.getJobactivityid(); // jobactivityname = vo.getJobactivityid();
if (vo.getJobgroupid() == null) { // if (vo.getJobgroupid() == null) {
jobtitle = resourcecominfo.getJobTitle(hrmId); // jobtitle = resourcecominfo.getJobTitle(hrmId);
jobactivityid = jobTitlesComInfo.getJobactivityid(jobtitle); // jobactivityid = jobTitlesComInfo.getJobactivityid(jobtitle);
jobgroupid = jobActivitiesComInfo.getJobgroupid(jobactivityid); // jobgroupid = jobActivitiesComInfo.getJobgroupid(jobactivityid);
jobgroupname = jobGroupsComInfo.getJobGroupsname(jobgroupid); // jobgroupname = jobGroupsComInfo.getJobGroupsname(jobgroupid);
} else { // } else {
jobgroupname = vo.getJobgroupid(); // jobgroupname = vo.getJobgroupid();
} // }
int jobtitleid = getJobTitles(vo.getJobtitle(), jobactivityname, jobgroupname); // int jobtitleid = getJobTitles(vo.getJobtitle(), jobactivityname, jobgroupname);
if (jobtitleid == -1) { // if (jobtitleid == -1) {
resultList.add(createLog(vo, "创建", "失败", "职务类别不存在")); // resultList.add(createLog(vo, "创建", "失败", "职务类别不存在"));
continue; // continue;
} else if (jobtitleid == -2) { // } else if (jobtitleid == -2) {
resultList.add(createLog(vo, "创建", "失败", "职务不存在")); // resultList.add(createLog(vo, "创建", "失败", "职务不存在"));
continue; // continue;
} else if (jobtitleid == -3) { // } else if (jobtitleid == -3) {
resultList.add(createLog(vo, "创建", "失败", "岗位名称不存在")); // resultList.add(createLog(vo, "创建", "失败", "岗位名称不存在"));
continue; // continue;
} // }
hrm.setJobtitle(jobtitleid); // hrm.setJobtitle(jobtitleid);
} //}
if (Util.getIntValue(hrmId) < 0) continue; if (Util.getIntValue(hrmId) < 0) continue;

Write Preview
Loading…
Cancel
Save