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

优化职级模板字段顺序

Browse Source
pull/53/head^2
‘ml’ 2 years ago
parent ba2434b130
commit 9517ad15d6
1 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File

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

@ -1573,7 +1573,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
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(cellValue);
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
continue nextRow; continue nextRow;
@ -1584,7 +1584,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
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(cellValue);
historyDetailPO.setStatus("0"); historyDetailPO.setStatus("0");
saveImportDetailLog(historyDetailPO); saveImportDetailLog(historyDetailPO);
continue nextRow; continue nextRow;
@ -1595,20 +1595,25 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
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(cellValue);
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(cellValue);
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;
@ -1672,7 +1677,6 @@ 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());
gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradeNo, schemeNew.getId()); gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradeNo, schemeNew.getId());
gradePO.setGradeNo(gradeNo); gradePO.setGradeNo(gradeNo);
@ -1681,7 +1685,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
// 关联方案id // 关联方案id
gradePO.setSchemeId(schemeNew.getId()); gradePO.setSchemeId(schemeNew.getId());
// 关联职等id // 关联职等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 +1692,26 @@ 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()); }else{
MapperProxyFactory.getProxy(GradeMapper.class).updateGrade(gradePO); gradePO.setLevelId(levelIds);
} else {
MapperProxyFactory.getProxy(GradeMapper.class).insertIgnoreNull(gradePO); MapperProxyFactory.getProxy(GradeMapper.class).insertIgnoreNull(gradePO);
} }
} }
@ -1951,20 +1965,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