Commit 95c314a4 authored by fangxinjiang's avatar fangxinjiang

人员档案批量更新及新增,排列派单,批量更新预入值 档案地 区县 选填-fxj

parent 65dee890
...@@ -972,7 +972,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -972,7 +972,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg.add(EmployeeConstants.FILE_PROVINCE); errorMsg.add(EmployeeConstants.FILE_PROVINCE);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.FILE_PROVINCE)); errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.FILE_PROVINCE));
} }
if (Common.isEmpty(employeeInfo.getFileTown())) { //2024-09-26 fxj 档案地县选填 MVP1.6.11
if (Common.isEmpty(employeeInfo.getFileCity())) {
errorMsg.add(EmployeeConstants.FILE_PROVINCE); errorMsg.add(EmployeeConstants.FILE_PROVINCE);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.FILE_PROVINCE)); errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.FILE_PROVINCE));
} }
...@@ -2008,8 +2009,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2008,8 +2009,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} }
// 档案地和通信地址 校验 // 档案地和通信地址 校验
if (Common.isNotNull(headMap.get("档案所在省")) if (Common.isNotNull(headMap.get("档案所在省"))
|| Common.isNotNull(headMap.get("档案所在市")) || Common.isNotNull(headMap.get("档案所在市"))){
|| Common.isNotNull(headMap.get("档案所在县"))){
if (Common.isEmpty(excel.getFileTown())) { if (Common.isEmpty(excel.getFileTown())) {
errorMsg.add(EmployeeConstants.FILE_PROVINCE); errorMsg.add(EmployeeConstants.FILE_PROVINCE);
} }
......
...@@ -2044,8 +2044,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2044,8 +2044,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
try { try {
employee.setFileTown(Integer.parseInt(excel.getFileTown())); employee.setFileTown(Integer.parseInt(excel.getFileTown()));
} catch (Exception e) { } catch (Exception e) {
errorMessageList.add(new ErrorMessage<>(excel.getRowIndex(), "未找到县!")); //errorMessageList.add(new ErrorMessage<>(excel.getRowIndex(), "未找到县!")); 2024-09-26 mvp1.6.11 预入职档案地区县选填
continue; //continue;
throw new RuntimeException("档案地址-区/县转换异常");
} }
} }
tPreEmployeeInfoService.updateById(employee); tPreEmployeeInfoService.updateById(employee);
......
...@@ -140,7 +140,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable { ...@@ -140,7 +140,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
/** /**
* 档案-县 * 档案-县
*/ */
@ExcelAttribute(name = "档案-县" ,isArea = true,parentField = "fileCity", isNotEmpty = true, errorInfo = "档案-县不能为空") @ExcelAttribute(name = "档案-县" ,isArea = true,parentField = "fileCity", isNotEmpty = false, errorInfo = "档案-县不能为空")
@Schema(description = "档案-县" ) @Schema(description = "档案-县" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("档案-县" ) @ExcelProperty("档案-县" )
......
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