Commit 9d48d3c0 authored by hongguangwu's avatar hongguangwu

MVP1.7.6-优化档案省市县联动导入的问题

parent c7dc2161
...@@ -1515,23 +1515,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1515,23 +1515,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} else { } else {
saveEmp.setIdProvince(Integer.parseInt(areaStr)); saveEmp.setIdProvince(Integer.parseInt(areaStr));
} }
} if (Common.isNotNull(excel.getIdCity())) {
if (Common.isNotNull(excel.getIdCity())) { areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdCity().trim() + CommonConstants.DOWN_LINE_STRING + excel.getIdProvince().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdCity().trim() + CommonConstants.DOWN_LINE_STRING + excel.getIdProvince().trim()); if (Common.isEmpty(areaStr)) {
if (Common.isEmpty(areaStr)) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard()));
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard())); } else {
} else { saveEmp.setIdCity(Integer.parseInt(areaStr));
saveEmp.setIdCity(Integer.parseInt(areaStr)); }
} }
} if (Common.isNotNull(excel.getIdTown())) {
if (Common.isNotNull(excel.getIdTown())) { areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdTown().trim() + CommonConstants.DOWN_LINE_STRING + excel.getIdCity().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdTown().trim() + CommonConstants.DOWN_LINE_STRING + excel.getIdCity().trim()); if (Common.isEmpty(areaStr)) {
if (Common.isEmpty(areaStr)) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard()));
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard())); } else {
} else { saveEmp.setIdTown(Integer.parseInt(areaStr));
saveEmp.setIdTown(Integer.parseInt(areaStr)); }
} }
} }
// 档案所在地 // 档案所在地
if (Common.isNotNull(excel.getFileProvince())) { if (Common.isNotNull(excel.getFileProvince())) {
saveEmp.setFileProvince(Integer.parseInt(excel.getFileProvince())); saveEmp.setFileProvince(Integer.parseInt(excel.getFileProvince()));
...@@ -2046,23 +2047,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2046,23 +2047,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} else { } else {
saveEmp.setIdProvince(Integer.parseInt(areaStr)); saveEmp.setIdProvince(Integer.parseInt(areaStr));
} }
} if (Common.isNotNull(excel.getIdCity())) {
if (Common.isNotNull(excel.getIdCity())) { areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdCity().trim() + CommonConstants.DOWN_LINE_STRING + excel.getIdProvince().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdCity().trim() + CommonConstants.DOWN_LINE_STRING + excel.getIdProvince().trim()); if (Common.isEmpty(areaStr)) {
if (Common.isEmpty(areaStr)) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard()));
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard())); } else {
} else { saveEmp.setIdCity(Integer.parseInt(areaStr));
saveEmp.setIdCity(Integer.parseInt(areaStr)); }
} if (Common.isNotNull(excel.getIdTown())) {
} areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdTown().trim() + CommonConstants.DOWN_LINE_STRING + excel.getIdCity().trim());
if (Common.isNotNull(excel.getIdTown())) { if (Common.isEmpty(areaStr)) {
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdTown().trim() + CommonConstants.DOWN_LINE_STRING + excel.getIdCity().trim()); errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard()));
if (Common.isEmpty(areaStr)) { } else {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard())); saveEmp.setIdTown(Integer.parseInt(areaStr));
} else { }
saveEmp.setIdTown(Integer.parseInt(areaStr)); }
} }
} }
if (Common.isNotNull(excel.getIsCollege())) { if (Common.isNotNull(excel.getIsCollege())) {
if (CommonConstants.IS_TRUE.equals(excel.getIsCollege())) { if (CommonConstants.IS_TRUE.equals(excel.getIsCollege())) {
saveEmp.setIsCollege(CommonConstants.ONE_INT); saveEmp.setIsCollege(CommonConstants.ONE_INT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment