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

Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

Browse Source
pull/53/head
dxfeng 2 years ago
parent d16f13405c 1baf55e04f
commit b7217dae23
1 changed files with 153 additions and 91 deletions
Show Stats Download Patch File Download Diff File

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

@ -1569,11 +1569,11 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
} }
map.put(infoPO.getFieldName(), reallyValue); map.put(infoPO.getFieldName(), reallyValue);
// 方案页校验 // 方案页校验
if ("scheme_no".equals(infoPO.getFieldName()) && s == 0) { if ("scheme_no".equals(infoPO.getFieldName()) && s == 0 && "add".equals(operateType)) {
List<SchemePO> schemePOS = MapperProxyFactory.getProxy(SchemeMapper.class).listByNo(Util.null2String(reallyValue)); List<SchemePO> schemePOS = MapperProxyFactory.getProxy(SchemeMapper.class).listByNo(Util.null2String(reallyValue));
if (schemePOS.size() > 0) { if (schemePOS.size() > 0) {
historyDetailPO.setOperateDetail("方案页导入：方案编号[" + reallyValue + "]与原有编号重复"); historyDetailPO.setOperateDetail("方案编号[" + reallyValue + "]与原有编号重复");
historyDetailPO.setRelatedName(infoPO.getFieldName()); historyDetailPO.setRelatedName("方案页导入");
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
continue nextRow; continue nextRow;
@ -1583,8 +1583,8 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
if ("scheme_no".equals(infoPO.getFieldName()) && s == 1) { if ("scheme_no".equals(infoPO.getFieldName()) && s == 1) {
List<SchemePO> schemePOS = MapperProxyFactory.getProxy(SchemeMapper.class).listByNo(Util.null2String(reallyValue)); List<SchemePO> schemePOS = MapperProxyFactory.getProxy(SchemeMapper.class).listByNo(Util.null2String(reallyValue));
if (schemePOS.size() == 0) { if (schemePOS.size() == 0) {
historyDetailPO.setOperateDetail("职等页导入：未找到编号为[" + reallyValue + "]的方案"); historyDetailPO.setOperateDetail("未找到编号为[" + reallyValue + "]的方案");
historyDetailPO.setRelatedName(infoPO.getFieldName()); historyDetailPO.setRelatedName("职等页导入");
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
continue nextRow; continue nextRow;
@ -1594,21 +1594,26 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
if ("scheme_no".equals(infoPO.getFieldName()) && s == 2) { if ("scheme_no".equals(infoPO.getFieldName()) && s == 2) {
List<SchemePO> schemePOS = MapperProxyFactory.getProxy(SchemeMapper.class).listByNo(Util.null2String(reallyValue)); List<SchemePO> schemePOS = MapperProxyFactory.getProxy(SchemeMapper.class).listByNo(Util.null2String(reallyValue));
if (schemePOS.size() == 0) { if (schemePOS.size() == 0) {
historyDetailPO.setOperateDetail("职级页导入：未找到编号为[" + reallyValue + "]的方案"); historyDetailPO.setOperateDetail("未找到编号为[" + reallyValue + "]的方案");
historyDetailPO.setRelatedName(infoPO.getFieldName()); historyDetailPO.setRelatedName("职级页导入");
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
continue nextRow; continue nextRow;
} }
} }
if ("level_no".equals(infoPO.getFieldName()) && s == 2) { if ("level_no".equals(infoPO.getFieldName()) && s == 2) {
List<LevelPO> levelPOS = MapperProxyFactory.getProxy(LevelMapper.class).listByNo(Util.null2String(reallyValue)); String[] split = Util.null2String(reallyValue).split(",");
if (levelPOS.size() == 0) { if (split.length > 0) {
historyDetailPO.setOperateDetail("职级页导入：未找到编号为[" + reallyValue + "]的职等"); for (int index = 0; index < split.length - 1; index++) {
historyDetailPO.setRelatedName(infoPO.getFieldName()); List<LevelPO> levelPOS = MapperProxyFactory.getProxy(LevelMapper.class).listByNo(split[index]);
historyDetailPO.setStatus("0"); if (levelPOS.size() == 0) {
saveImportDetailLog(historyDetailPO); historyDetailPO.setOperateDetail("未找到编号为[" + reallyValue + "]的职等");
continue nextRow; historyDetailPO.setRelatedName("职级页导入");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
}
} }
} }
} }
@ -1646,8 +1651,8 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
if (schemeNew != null) { if (schemeNew != null) {
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelNo, schemeNew.getId()); levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelNo, schemeNew.getId());
if (levelNew != null) { if (levelNew != null) {
historyDetailPO.setRelatedName("职等页导入"); historyDetailPO.setRelatedName("职等编号");
historyDetailPO.setOperateDetail("同一方案" + schemeNo + "下，职等编号不可重复"); historyDetailPO.setOperateDetail("职等页导入:同一方案" + schemeNo + "下，职等编号不可重复");
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
continue nextRow; continue nextRow;
@ -1665,6 +1670,12 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
levelPO.setUpdateTime((Date) map.get("update_time")); levelPO.setUpdateTime((Date) map.get("update_time"));
MapperProxyFactory.getProxy(LevelMapper.class).insertIgnoreNull(levelPO); MapperProxyFactory.getProxy(LevelMapper.class).insertIgnoreNull(levelPO);
} }
} else {
historyDetailPO.setRelatedName("职等页导入");
historyDetailPO.setOperateDetail("未找到编号为[" + schemeNo + "]的方案");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
} }
} else if (s == 2) { } else if (s == 2) {
String gradeNo = (String) map.get("grade_no"); String gradeNo = (String) map.get("grade_no");
@ -1672,16 +1683,27 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
String levelNo = (String) map.get("level_no"); String levelNo = (String) map.get("level_no");
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemeNo); schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemeNo);
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelNo, schemeNew.getId()); if (schemeNew == null) {
historyDetailPO.setRelatedName("职级页导入");
historyDetailPO.setOperateDetail("未找到编号为[" + schemeNo + "]的方案");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradeNo, schemeNew.getId()); gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradeNo, schemeNew.getId());
if (gradeNew == null) {
historyDetailPO.setRelatedName("职级页导入");
historyDetailPO.setOperateDetail("未找到编号为[" + schemeNo + "]的职等");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
gradePO.setGradeNo(gradeNo); gradePO.setGradeNo(gradeNo);
gradePO.setGradeName((String) map.get("grade_name")); gradePO.setGradeName((String) map.get("grade_name"));
gradePO.setDescription((String) map.get("grade_description")); gradePO.setDescription((String) map.get("grade_description"));
// 关联方案id // 关联方案id
gradePO.setSchemeId(schemeNew.getId()); gradePO.setSchemeId(schemeNew.getId());
// 关联职等id
gradePO.setLevelId(String.valueOf(levelNew.getId()));
gradePO.setGradeNo((String) map.get("grade_no")); gradePO.setGradeNo((String) map.get("grade_no"));
gradePO.setForbiddenTag((int) map.get("forbidden_tag")); gradePO.setForbiddenTag((int) map.get("forbidden_tag"));
gradePO.setIsUsed(1); gradePO.setIsUsed(1);
@ -1689,15 +1711,27 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
gradePO.setDeleteType((int) map.get("delete_type")); gradePO.setDeleteType((int) map.get("delete_type"));
gradePO.setCreateTime((Date) map.get("create_time")); gradePO.setCreateTime((Date) map.get("create_time"));
gradePO.setUpdateTime((Date) map.get("update_time")); gradePO.setUpdateTime((Date) map.get("update_time"));
String[] split = levelNo.split(",");
String levelIds = null;
if (split.length > 0) {
for (int index = 0; index < split.length; index++) {
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(split[index], schemeNew.getId());
if (levelIds != null) {
levelIds = levelIds + "," + levelNew.getId();
} else {
levelIds = String.valueOf(levelNew.getId());
}
}
}
if (gradeNew != null) { if (gradeNew != null) {
//职级已存在，重新拼接level_id historyDetailPO.setRelatedName("职级页导入");
gradePO.setLevelId(gradeNew.getLevelId() + "," + levelNew.getId()); historyDetailPO.setOperateDetail("同一方案[" + schemeNo + "]下，职级编号不可重复");
historyDetailPO.setStatus("0");
gradePO.setId(gradeNew.getId()); saveImportDetailLog(historyDetailPO);
gradePO.setCreateTime(null); continue nextRow;
gradePO.setUpdateTime(new Date());
MapperProxyFactory.getProxy(GradeMapper.class).updateGrade(gradePO);
} else { } else {
// 关联职等id
gradePO.setLevelId(levelIds);
MapperProxyFactory.getProxy(GradeMapper.class).insertIgnoreNull(gradePO); MapperProxyFactory.getProxy(GradeMapper.class).insertIgnoreNull(gradePO);
} }
} }
@ -1706,71 +1740,99 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
historyDetailPO.setStatus("1"); historyDetailPO.setStatus("1");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
} else if ("update".equals(operateType)) { } else if ("update".equals(operateType)) {
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo((String) map.get("scheme_no")); if (s == 0) {
if (schemeNew != null) { schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo((String) map.get("scheme_no"));
schemeNew.setSchemeNo((String) map.get("scheme_no")); if (schemeNew != null) {
schemeNew.setSchemeName((String) map.get("scheme_name")); schemeNew.setSchemeName((String) map.get("scheme_name"));
schemeNew.setSchemeDescription((String) map.get("scheme_description")); schemeNew.setSchemeDescription((String) map.get("scheme_description"));
schemeNew.setUpdateTime((Date) map.get("update_time")); schemeNew.setUpdateTime((Date) map.get("update_time"));
MapperProxyFactory.getProxy(SchemeMapper.class).updateScheme(schemeNew); MapperProxyFactory.getProxy(SchemeMapper.class).updateScheme(schemeNew);
} else { } else {
schemeNew.setSchemeNo((String) map.get("scheme_no")); historyDetailPO.setRelatedName("方案更新");
schemeNew.setSchemeName((String) map.get("scheme_name")); historyDetailPO.setOperateDetail("未找到编号为[" + map.get("scheme_no") + "]的方案");
schemeNew.setSchemeDescription((String) map.get("scheme_description")); historyDetailPO.setStatus("0");
schemeNew.setForbiddenTag((int) map.get("forbidden_tag")); saveImportDetailLog(historyDetailPO);
schemeNew.setIsUsed(1); continue nextRow;
schemeNew.setCreator((long) user.getUID()); }
schemeNew.setDeleteType((int) map.get("delete_type")); } else if (s == 1) {
schemeNew.setCreateTime((Date) map.get("create_time")); String schemeNo = (String) map.get("scheme_no");
schemeNew.setUpdateTime((Date) map.get("update_time")); String levelNo = (String) map.get("level_no");
MapperProxyFactory.getProxy(SchemeMapper.class).insertIgnoreNull(schemeNew); schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemeNo);
} if (schemeNew != null) {
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelNo, schemeNew.getId());
//查询职等信息 if (levelNew != null) {
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo((String) map.get("scheme_no")); levelNew.setLevelName((String) map.get("level_name"));
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid((String) map.get("level_no"), schemeNew.getId()); levelNew.setDescription((String) map.get("level_description"));
if (levelNew != null) { //关联方案id
levelNew.setLevelNo((String) map.get("level_no")); levelNew.setSchemeId(schemeNew.getId());
levelNew.setLevelName((String) map.get("level_name")); levelNew.setUpdateTime((Date) map.get("update_time"));
levelNew.setDescription((String) map.get("level_description")); MapperProxyFactory.getProxy(LevelMapper.class).updateLevel(levelNew);
//关联方案id } else {
levelNew.setSchemeId(schemeNew.getId()); historyDetailPO.setRelatedName("职等页更新");
levelNew.setUpdateTime((Date) map.get("update_time")); historyDetailPO.setOperateDetail("未找到编号为[" + schemeNo + "]的方案");
MapperProxyFactory.getProxy(LevelMapper.class).updateLevel(levelNew); historyDetailPO.setStatus("0");
} else { saveImportDetailLog(historyDetailPO);
levelNew.setLevelNo((String) map.get("level_no")); continue nextRow;
levelNew.setLevelName((String) map.get("level_name")); }
levelNew.setDescription((String) map.get("level_description")); } else {
//关联方案id historyDetailPO.setRelatedName("职等页更新");
levelNew.setSchemeId(schemeNew.getId()); historyDetailPO.setOperateDetail("未找到编号为[" + schemeNo + "]的方案，无法更新");
levelNew.setForbiddenTag((int) map.get("forbidden_tag")); historyDetailPO.setStatus("0");
levelNew.setIsUsed(1); saveImportDetailLog(historyDetailPO);
levelNew.setCreator((long) user.getUID()); continue nextRow;
levelNew.setDeleteType((int) map.get("delete_type")); }
levelNew.setCreateTime((Date) map.get("create_time")); } else if (s == 2) {
levelNew.setUpdateTime((Date) map.get("update_time")); String gradeNo = (String) map.get("grade_no");
MapperProxyFactory.getProxy(LevelMapper.class).insertIgnoreNull(levelNew); String schemeNo = (String) map.get("scheme_no");
} String levelNo = (String) map.get("level_no");
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemeNo);
gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid((String) map.get("grade_no"), schemeNew.getId()); if (schemeNew == null) {
if (gradeNew != null) { historyDetailPO.setRelatedName("职级页更新");
gradeNew.setGradeNo((String) map.get("grade_no")); historyDetailPO.setOperateDetail("未找到编号为[" + schemeNo + "]的方案");
gradeNew.setGradeName((String) map.get("grade_name")); historyDetailPO.setStatus("0");
gradeNew.setDescription((String) map.get("grade_description")); saveImportDetailLog(historyDetailPO);
// 关联方案id continue nextRow;
gradeNew.setSchemeId(schemeNew.getId()); }
// 关联职等id gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradeNo, schemeNew.getId());
gradeNew.setLevelId(String.valueOf(levelNew.getId())); if (gradeNew == null) {
gradeNew.setUpdateTime((Date) map.get("update_time")); historyDetailPO.setRelatedName("职级页更新");
GradePO gradePOTmp = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(gradeNew.getId()); historyDetailPO.setOperateDetail("未找到编号为[" + schemeNo + "]的职等");
if (gradePOTmp != null) { historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
String[] split = levelNo.split(",");
String levelIds = null;
if (split.length > 0) {
for (int index = 0; index < split.length; index++) {
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(split[index], schemeNew.getId());
if (levelIds != null) {
levelIds = levelIds + "," + levelNew.getId();
} else {
levelIds = String.valueOf(levelNew.getId());
}
}
}
if (gradeNew != null) {
gradeNew.setSchemeId(schemeNew.getId());
gradeNew.setGradeName((String) map.get("grade_name"));
gradeNew.setDescription((String) map.get("grade_description"));
// 关联职等id
gradeNew.setLevelId(levelIds);
gradeNew.setUpdateTime((Date) map.get("update_time"));
MapperProxyFactory.getProxy(GradeMapper.class).updateGrade(gradeNew); MapperProxyFactory.getProxy(GradeMapper.class).updateGrade(gradeNew);
} else {
historyDetailPO.setRelatedName("职级页更新");
historyDetailPO.setOperateDetail("未找到编号[" + schemeNo + "]的职级，无法更新");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
} }
} else {
MapperProxyFactory.getProxy(GradeMapper.class).insertIgnoreNull(gradePO);
} }
historyDetailPO.setOperateDetail("更新成功");
historyDetailPO.setStatus("1");
saveImportDetailLog(historyDetailPO);
} }
} }
@ -1951,20 +2013,20 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
schemeList.add(column); schemeList.add(column);
} }
if("职等编号".equals(column)){ if("职等编号".equals(column)){
levelList.add(column); levelList.add(0,column);
gradeList.add(column); gradeList.add(column);
} }
if("职等名称".equals(column)){ if("职等名称".equals(column)){
levelList.add(column); levelList.add(1,column);
} }
if("职等说明".equals(column)){ if("职等说明".equals(column)){
levelList.add(column); levelList.add(column);
} }
if("职级编号".equals(column)){ if("职级编号".equals(column)){
gradeList.add(column); gradeList.add(0,column);
} }
if("职级名称".equals(column)){ if("职级名称".equals(column)){
gradeList.add(column); gradeList.add(1,column);
} }
if("职级说明".equals(column)){ if("职级说明".equals(column)){
gradeList.add(column); gradeList.add(column);

Write Preview
Loading…
Cancel
Save