|
|
|
@ -1525,11 +1525,11 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
|
|
|
|
|
// 组装待处理数据
|
|
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
|
SchemePO schemePO = new SchemePO();
|
|
|
|
|
SchemePO schemeNew = null;
|
|
|
|
|
SchemePO schemeNew = new SchemePO();;
|
|
|
|
|
GradePO gradePO = new GradePO();
|
|
|
|
|
GradePO gradeNew = null;
|
|
|
|
|
GradePO gradeNew = new GradePO();
|
|
|
|
|
LevelPO levelPO = new LevelPO();
|
|
|
|
|
LevelPO levelNew = null;
|
|
|
|
|
LevelPO levelNew = new LevelPO();
|
|
|
|
|
|
|
|
|
|
historyDetailPO.setRowNums(String.valueOf(i + 1));
|
|
|
|
|
for (int cellIndex = 0; cellIndex < lastCellNum; cellIndex++) {
|
|
|
|
@ -1566,133 +1566,159 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
|
|
|
|
|
continue nextRow;
|
|
|
|
|
}
|
|
|
|
|
map.put(infoPO.getFieldName(), reallyValue);
|
|
|
|
|
// 方案
|
|
|
|
|
if("scheme_no".equals(infoPO.getFieldName())){
|
|
|
|
|
List<SchemePO> schemePOS = MapperProxyFactory.getProxy(SchemeMapper.class).listByNo(Util.null2String(reallyValue));
|
|
|
|
|
if(schemePOS.size()>0){
|
|
|
|
|
historyDetailPO.setOperateDetail("方案编号"+reallyValue+"与原有编号重复");
|
|
|
|
|
historyDetailPO.setStatus("0");
|
|
|
|
|
saveImportDetailLog(historyDetailPO);
|
|
|
|
|
continue nextRow;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 职等
|
|
|
|
|
// if ("level_no".equals(infoPO.getFieldName())){
|
|
|
|
|
// List<LevelPO> levelPOS = MapperProxyFactory.getProxy(LevelMapper.class).listByNo(Util.null2String(reallyValue));
|
|
|
|
|
// if(levelPOS.size()>0){
|
|
|
|
|
// historyDetailPO.setOperateDetail("职等编号"+reallyValue+"与原有编号重复");
|
|
|
|
|
// historyDetailPO.setStatus("0");
|
|
|
|
|
// saveImportDetailLog(historyDetailPO);
|
|
|
|
|
// continue nextRow;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// 职级
|
|
|
|
|
// if("grade_no".equals(infoPO.getFieldName())){
|
|
|
|
|
// List<GradePO> gradePOS = MapperProxyFactory.getProxy(GradeMapper.class).listByNo(Util.null2String(reallyValue));
|
|
|
|
|
// if(gradePOS.size()>0){
|
|
|
|
|
// historyDetailPO.setOperateDetail("职级编号"+reallyValue+"与原有编号重复");
|
|
|
|
|
// historyDetailPO.setStatus("0");
|
|
|
|
|
// saveImportDetailLog(historyDetailPO);
|
|
|
|
|
// continue nextRow;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 校验、数据交互
|
|
|
|
|
if (i == 0){
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
String schemeNo = (String) map.get("scheme_no");
|
|
|
|
|
//Long schemeId = MapperProxyFactory.getProxy(SchemeMapper.class)
|
|
|
|
|
if("add".equals(operateType)){
|
|
|
|
|
|
|
|
|
|
map.put("creator", user.getUID());
|
|
|
|
|
map.put("delete_type", 0);
|
|
|
|
|
Date currDate = new Date();
|
|
|
|
|
map.put("create_time", currDate);
|
|
|
|
|
map.put("update_time", currDate);
|
|
|
|
|
// 禁用表示为空,默认启用
|
|
|
|
|
map.put("forbidden_tag", 0);
|
|
|
|
|
map.put("is_used", 1);
|
|
|
|
|
// param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), StaffSearchParam.class);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
schemePO.setSchemeNo((String)map.get("scheme_no"));
|
|
|
|
|
schemePO.setSchemeName((String)map.get("scheme_name"));
|
|
|
|
|
schemePO.setSchemeDescription((String)map.get("scheme_description"));
|
|
|
|
|
schemePO.setForbiddenTag((int)map.get("forbidden_tag"));
|
|
|
|
|
schemePO.setIsUsed(1);
|
|
|
|
|
schemePO.setCreator((long) user.getUID());
|
|
|
|
|
schemePO.setDeleteType((int)map.get("delete_type"));
|
|
|
|
|
schemePO.setCreateTime((Date) map.get("create_time"));
|
|
|
|
|
schemePO.setUpdateTime((Date) map.get("update_time"));
|
|
|
|
|
|
|
|
|
|
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemePO.getSchemeNo());
|
|
|
|
|
if (schemeNew==null){
|
|
|
|
|
MapperProxyFactory.getProxy(SchemeMapper.class).insertIgnoreNull(schemePO);
|
|
|
|
|
}else{
|
|
|
|
|
historyDetailPO.setOperateDetail("方案编号"+schemePO.getSchemeNo()+"与原有编号重复");
|
|
|
|
|
historyDetailPO.setStatus("0");
|
|
|
|
|
saveImportDetailLog(historyDetailPO);
|
|
|
|
|
}
|
|
|
|
|
map.put("creator", user.getUID());
|
|
|
|
|
map.put("delete_type", 0);
|
|
|
|
|
Date currDate = new Date();
|
|
|
|
|
map.put("create_time", currDate);
|
|
|
|
|
map.put("update_time", currDate);
|
|
|
|
|
// 禁用表示为空,默认启用
|
|
|
|
|
map.put("forbidden_tag", 0);
|
|
|
|
|
map.put("is_used", 1);
|
|
|
|
|
if ("add".equals(operateType)) {
|
|
|
|
|
schemePO.setSchemeNo((String)map.get("scheme_no"));
|
|
|
|
|
schemePO.setSchemeName((String)map.get("scheme_name"));
|
|
|
|
|
schemePO.setSchemeDescription((String)map.get("scheme_description"));
|
|
|
|
|
schemePO.setForbiddenTag((int)map.get("forbidden_tag"));
|
|
|
|
|
schemePO.setIsUsed(1);
|
|
|
|
|
schemePO.setCreator((long) user.getUID());
|
|
|
|
|
schemePO.setDeleteType((int)map.get("delete_type"));
|
|
|
|
|
schemePO.setCreateTime((Date) map.get("create_time"));
|
|
|
|
|
schemePO.setUpdateTime((Date) map.get("update_time"));
|
|
|
|
|
|
|
|
|
|
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemePO.getSchemeNo());
|
|
|
|
|
if (schemeNew==null){
|
|
|
|
|
MapperProxyFactory.getProxy(SchemeMapper.class).insertIgnoreNull(schemePO);
|
|
|
|
|
}else{
|
|
|
|
|
historyDetailPO.setOperateDetail("方案编号"+schemePO.getSchemeNo()+"与原有编号重复");
|
|
|
|
|
historyDetailPO.setStatus("0");
|
|
|
|
|
saveImportDetailLog(historyDetailPO);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 新增完成后,再次插入
|
|
|
|
|
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemePO.getSchemeNo());
|
|
|
|
|
levelPO.setLevelNo((String) map.get("level_no"));
|
|
|
|
|
levelPO.setLevelName((String) map.get("level_name"));
|
|
|
|
|
levelPO.setDescription((String) map.get("level_description"));
|
|
|
|
|
//关联方案id
|
|
|
|
|
levelPO.setSchemeId(schemeNew.getId());
|
|
|
|
|
levelPO.setForbiddenTag((int) map.get("forbidden_tag"));
|
|
|
|
|
levelPO.setIsUsed(1);
|
|
|
|
|
levelPO.setCreator((long) user.getUID());
|
|
|
|
|
levelPO.setDeleteType((int)map.get("delete_type"));
|
|
|
|
|
levelPO.setCreateTime((Date) map.get("create_time"));
|
|
|
|
|
levelPO.setUpdateTime((Date) map.get("update_time"));
|
|
|
|
|
|
|
|
|
|
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelPO.getLevelNo(),schemeNew.getId());
|
|
|
|
|
if(levelNew==null){
|
|
|
|
|
MapperProxyFactory.getProxy(LevelMapper.class).insertIgnoreNull(levelPO);
|
|
|
|
|
}
|
|
|
|
|
// 新增完成后,再次插入
|
|
|
|
|
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemePO.getSchemeNo());
|
|
|
|
|
levelPO.setLevelNo((String) map.get("level_no"));
|
|
|
|
|
levelPO.setLevelName((String) map.get("level_name"));
|
|
|
|
|
levelPO.setDescription((String) map.get("level_description"));
|
|
|
|
|
//关联方案id
|
|
|
|
|
levelPO.setSchemeId(schemeNew.getId());
|
|
|
|
|
levelPO.setForbiddenTag((int) map.get("forbidden_tag"));
|
|
|
|
|
levelPO.setIsUsed(1);
|
|
|
|
|
levelPO.setCreator((long) user.getUID());
|
|
|
|
|
levelPO.setDeleteType((int)map.get("delete_type"));
|
|
|
|
|
levelPO.setCreateTime((Date) map.get("create_time"));
|
|
|
|
|
levelPO.setUpdateTime((Date) map.get("update_time"));
|
|
|
|
|
|
|
|
|
|
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelPO.getLevelNo(),schemeNew.getId());
|
|
|
|
|
if(levelNew==null){
|
|
|
|
|
MapperProxyFactory.getProxy(LevelMapper.class).insertIgnoreNull(levelPO);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelPO.getLevelNo(),schemeNew.getId());
|
|
|
|
|
gradePO.setGradeNo((String) map.get("grade_no"));
|
|
|
|
|
gradePO.setGradeName((String) map.get("grade_name"));
|
|
|
|
|
gradePO.setDescription((String) map.get("grade_description"));
|
|
|
|
|
// 关联方案id
|
|
|
|
|
gradePO.setSchemeId(schemeNew.getId());
|
|
|
|
|
// 关联职等id
|
|
|
|
|
gradePO.setLevelId(String.valueOf(levelNew.getId()));
|
|
|
|
|
gradePO.setGradeNo((String) map.get("grade_no"));
|
|
|
|
|
gradePO.setForbiddenTag((int) map.get("forbidden_tag"));
|
|
|
|
|
gradePO.setIsUsed(1);
|
|
|
|
|
gradePO.setCreator((long) user.getUID());
|
|
|
|
|
gradePO.setDeleteType((int)map.get("delete_type"));
|
|
|
|
|
gradePO.setCreateTime((Date) map.get("create_time"));
|
|
|
|
|
gradePO.setUpdateTime((Date) map.get("update_time"));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradePO.getGradeNo(),gradePO.getSchemeId());
|
|
|
|
|
if (gradeNew != null) {
|
|
|
|
|
//职级已存在,重新拼接level_id
|
|
|
|
|
gradePO.setLevelId(gradeNew.getLevelId()+","+levelNew.getId());
|
|
|
|
|
|
|
|
|
|
gradePO.setId(gradeNew.getId());
|
|
|
|
|
gradePO.setCreateTime(null);
|
|
|
|
|
gradePO.setUpdateTime(new Date());
|
|
|
|
|
MapperProxyFactory.getProxy(GradeMapper.class).updateGrade(gradePO);
|
|
|
|
|
}else{
|
|
|
|
|
MapperProxyFactory.getProxy(GradeMapper.class).insertIgnoreNull(gradePO);
|
|
|
|
|
}
|
|
|
|
|
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(levelPO.getLevelNo(),schemeNew.getId());
|
|
|
|
|
gradePO.setGradeNo((String) map.get("grade_no"));
|
|
|
|
|
gradePO.setGradeName((String) map.get("grade_name"));
|
|
|
|
|
gradePO.setDescription((String) map.get("grade_description"));
|
|
|
|
|
// 关联方案id
|
|
|
|
|
gradePO.setSchemeId(schemeNew.getId());
|
|
|
|
|
// 关联职等id
|
|
|
|
|
gradePO.setLevelId(String.valueOf(levelNew.getId()));
|
|
|
|
|
gradePO.setGradeNo((String) map.get("grade_no"));
|
|
|
|
|
gradePO.setForbiddenTag((int) map.get("forbidden_tag"));
|
|
|
|
|
gradePO.setIsUsed(1);
|
|
|
|
|
gradePO.setCreator((long) user.getUID());
|
|
|
|
|
gradePO.setDeleteType((int)map.get("delete_type"));
|
|
|
|
|
gradePO.setCreateTime((Date) map.get("create_time"));
|
|
|
|
|
gradePO.setUpdateTime((Date) map.get("update_time"));
|
|
|
|
|
|
|
|
|
|
gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradePO.getGradeNo(),gradePO.getSchemeId());
|
|
|
|
|
if (gradeNew != null) {
|
|
|
|
|
//职级已存在,重新拼接level_id
|
|
|
|
|
gradePO.setLevelId(gradeNew.getLevelId()+","+levelNew.getId());
|
|
|
|
|
|
|
|
|
|
gradePO.setId(gradeNew.getId());
|
|
|
|
|
gradePO.setCreateTime(null);
|
|
|
|
|
gradePO.setUpdateTime(new Date());
|
|
|
|
|
MapperProxyFactory.getProxy(GradeMapper.class).updateGrade(gradePO);
|
|
|
|
|
}else{
|
|
|
|
|
MapperProxyFactory.getProxy(GradeMapper.class).insertIgnoreNull(gradePO);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
historyDetailPO.setOperateDetail("添加成功");
|
|
|
|
|
historyDetailPO.setStatus("1");
|
|
|
|
|
saveImportDetailLog(historyDetailPO);
|
|
|
|
|
}else if ("update".equals(operateType)) {
|
|
|
|
|
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo((String)map.get("scheme_no"));
|
|
|
|
|
if(schemeNew!=null){
|
|
|
|
|
schemeNew.setSchemeNo((String)map.get("scheme_no"));
|
|
|
|
|
schemeNew.setSchemeName((String)map.get("scheme_name"));
|
|
|
|
|
schemeNew.setSchemeDescription((String)map.get("scheme_description"));
|
|
|
|
|
schemeNew.setUpdateTime((Date) map.get("update_time"));
|
|
|
|
|
MapperProxyFactory.getProxy(SchemeMapper.class).updateScheme(schemeNew);
|
|
|
|
|
}else{
|
|
|
|
|
schemeNew.setSchemeNo((String)map.get("scheme_no"));
|
|
|
|
|
schemeNew.setSchemeName((String)map.get("scheme_name"));
|
|
|
|
|
schemeNew.setSchemeDescription((String)map.get("scheme_description"));
|
|
|
|
|
schemeNew.setForbiddenTag((int)map.get("forbidden_tag"));
|
|
|
|
|
schemeNew.setIsUsed(1);
|
|
|
|
|
schemeNew.setCreator((long) user.getUID());
|
|
|
|
|
schemeNew.setDeleteType((int)map.get("delete_type"));
|
|
|
|
|
schemeNew.setCreateTime((Date) map.get("create_time"));
|
|
|
|
|
schemeNew.setUpdateTime((Date) map.get("update_time"));
|
|
|
|
|
MapperProxyFactory.getProxy(SchemeMapper.class).insertIgnoreNull(schemeNew);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//查询职等信息
|
|
|
|
|
schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo((String)map.get("scheme_no"));
|
|
|
|
|
levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid((String) map.get("level_no"),schemeNew.getId());
|
|
|
|
|
if(levelNew!=null){
|
|
|
|
|
levelNew.setLevelNo((String) map.get("level_no"));
|
|
|
|
|
levelNew.setLevelName((String) map.get("level_name"));
|
|
|
|
|
levelNew.setDescription((String) map.get("level_description"));
|
|
|
|
|
//关联方案id
|
|
|
|
|
levelNew.setSchemeId(schemeNew.getId());
|
|
|
|
|
levelNew.setUpdateTime((Date) map.get("update_time"));
|
|
|
|
|
MapperProxyFactory.getProxy(LevelMapper.class).updateLevel(levelNew);
|
|
|
|
|
}else{
|
|
|
|
|
levelNew.setLevelNo((String) map.get("level_no"));
|
|
|
|
|
levelNew.setLevelName((String) map.get("level_name"));
|
|
|
|
|
levelNew.setDescription((String) map.get("level_description"));
|
|
|
|
|
//关联方案id
|
|
|
|
|
levelNew.setSchemeId(schemeNew.getId());
|
|
|
|
|
levelNew.setForbiddenTag((int) map.get("forbidden_tag"));
|
|
|
|
|
levelNew.setIsUsed(1);
|
|
|
|
|
levelNew.setCreator((long) user.getUID());
|
|
|
|
|
levelNew.setDeleteType((int)map.get("delete_type"));
|
|
|
|
|
levelNew.setCreateTime((Date) map.get("create_time"));
|
|
|
|
|
levelNew.setUpdateTime((Date) map.get("update_time"));
|
|
|
|
|
MapperProxyFactory.getProxy(LevelMapper.class).insertIgnoreNull(levelNew);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
historyDetailPO.setOperateDetail("添加成功");
|
|
|
|
|
historyDetailPO.setStatus("1");
|
|
|
|
|
saveImportDetailLog(historyDetailPO);
|
|
|
|
|
gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid((String) map.get("grade_no"),schemeNew.getId());
|
|
|
|
|
if(gradeNew!=null){
|
|
|
|
|
gradeNew.setGradeNo((String) map.get("grade_no"));
|
|
|
|
|
gradeNew.setGradeName((String) map.get("grade_name"));
|
|
|
|
|
gradeNew.setDescription((String) map.get("grade_description"));
|
|
|
|
|
// 关联方案id
|
|
|
|
|
gradeNew.setSchemeId(schemeNew.getId());
|
|
|
|
|
// 关联职等id
|
|
|
|
|
gradeNew.setLevelId(String.valueOf(levelNew.getId()));
|
|
|
|
|
gradeNew.setUpdateTime((Date) map.get("update_time"));
|
|
|
|
|
GradePO gradePOTmp = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(gradeNew.getId());
|
|
|
|
|
if(gradePOTmp!=null){
|
|
|
|
|
|
|
|
|
|
MapperProxyFactory.getProxy(GradeMapper.class).updateGrade(gradeNew);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}else{
|
|
|
|
|
MapperProxyFactory.getProxy(GradeMapper.class).insertIgnoreNull(gradePO);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
return importHistoryId;
|
|
|
|
|