Commit a6e41457 authored by huyuchen's avatar huyuchen

优化修改

parent c4164d70
...@@ -168,6 +168,9 @@ implements TVacationInfoService { ...@@ -168,6 +168,9 @@ implements TVacationInfoService {
} }
if (!CollUtil.isEmpty(list)) { if (!CollUtil.isEmpty(list)) {
errorMessageList.addAll(Common.commonImportErrorMessage(list)); errorMessageList.addAll(Common.commonImportErrorMessage(list));
if (!errorMessageList.isEmpty()) {
return R.failed(errorMessageList,"数据校验失败");
}
List<TBusinessEmployeeExtendInfo> employeeExtentList = new ArrayList<>(); List<TBusinessEmployeeExtendInfo> employeeExtentList = new ArrayList<>();
List<TBusDept> busDeptList = busDeptService.list(); List<TBusDept> busDeptList = busDeptService.list();
R<TBusinessDataListVo> sdRes = archivesDaprUtil.getAllExtendList(); R<TBusinessDataListVo> sdRes = archivesDaprUtil.getAllExtendList();
...@@ -200,7 +203,6 @@ implements TVacationInfoService { ...@@ -200,7 +203,6 @@ implements TVacationInfoService {
return R.failed(errorMessageList,BusinessResultErrorMsg.SYS_ITEM_NOT_EXIST); return R.failed(errorMessageList,BusinessResultErrorMsg.SYS_ITEM_NOT_EXIST);
} }
TBusinessEmployeeExtendInfo businessEmployeeExtend; TBusinessEmployeeExtendInfo businessEmployeeExtend;
ErrorMessage errorMessage;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
int line = i + 2; int line = i + 2;
TVacationInfo entity = new TVacationInfo(); TVacationInfo entity = new TVacationInfo();
...@@ -212,9 +214,6 @@ implements TVacationInfoService { ...@@ -212,9 +214,6 @@ implements TVacationInfoService {
} }
TBusDept busDept = busDeptMap.get(businessEmployeeExtend.getDepartName()); TBusDept busDept = busDeptMap.get(businessEmployeeExtend.getDepartName());
boolean isSave = true; boolean isSave = true;
if (!errorMessageList.isEmpty()) {
continue;
}
if (Common.isEmpty(sysMap.get(dto.getVacationType()))) { if (Common.isEmpty(sysMap.get(dto.getVacationType()))) {
errorMessageList.add(new ErrorMessage(line, BusinessResultErrorMsg.VACATION_TYPE_DATA_NOT_EXIST, CommonConstants.RED)); errorMessageList.add(new ErrorMessage(line, BusinessResultErrorMsg.VACATION_TYPE_DATA_NOT_EXIST, CommonConstants.RED));
isSave = false; isSave = false;
......
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