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

职级导入提示优化1115

Browse Source
pull/65/head
‘ml’ 3 years ago
parent f8497aa3e6
commit 706edd43ed
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File

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

@ -1687,7 +1687,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
List<LevelPO> levelPOS = MapperProxyFactory.getProxy(LevelMapper.class).listByNo(split[index]); List<LevelPO> levelPOS = MapperProxyFactory.getProxy(LevelMapper.class).listByNo(split[index]);
if (levelPOS.size() == 0) { if (levelPOS.size() == 0) {
historyDetailPO.setRelatedName(relatedName); historyDetailPO.setRelatedName(relatedName);
historyDetailPO.setOperateDetail("未找到编号为[" + reallyValue + "]的职等"); historyDetailPO.setOperateDetail("未找到编号为[" + split[index] + "]的职等");
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
continue nextRow; continue nextRow;
@ -1788,6 +1788,13 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
if (split.length > 0) { if (split.length > 0) {
for (int index = 0; index < split.length; index++) { for (int index = 0; index < split.length; index++) {
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(split[index], schemeNew.getId()); levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(split[index], schemeNew.getId());
if (levelNew == null) {
historyDetailPO.setRelatedName(relatedName);
historyDetailPO.setOperateDetail("未找到编号为[" + split[index] + "]的职等");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
if (levelIds != null) { if (levelIds != null) {
levelIds = levelIds + "," + levelNew.getId(); levelIds = levelIds + "," + levelNew.getId();
} else { } else {
@ -1860,7 +1867,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
} }
break; break;
case 2: case 2:
String gradeNo = (String) map.get("grade_no");
String schemeNo2 = (String) map.get("scheme_no"); String schemeNo2 = (String) map.get("scheme_no");
String levelNo2 = (String) map.get("level_no"); String levelNo2 = (String) map.get("level_no");
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemeNo2); schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemeNo2);
@ -1871,20 +1877,19 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
continue nextRow; continue nextRow;
} }
gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradeNo, schemeNew.getId());
if (gradeNew == null) {
historyDetailPO.setRelatedName(relatedName);
historyDetailPO.setOperateDetail("未找到编号为[" + schemeNo2 + "]的职等");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
// 处理职级编号 // 处理职级编号
String[] split = levelNo2.split(","); String[] split = levelNo2.split(",");
String levelIds = null; String levelIds = null;
if (split.length > 0) { if (split.length > 0) {
for (int index = 0; index < split.length; index++) { for (int index = 0; index < split.length; index++) {
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(split[index], schemeNew.getId()); levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(split[index], schemeNew.getId());
if (levelNew == null) {
historyDetailPO.setRelatedName(relatedName);
historyDetailPO.setOperateDetail("未找到编号为[" + split[index] + "]的职等");
historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO);
continue nextRow;
}
if (levelIds != null) { if (levelIds != null) {
levelIds = levelIds + "," + levelNew.getId(); levelIds = levelIds + "," + levelNew.getId();
} else { } else {

Write Preview
Loading…
Cancel
Save