Commit 2ccf7328 authored by fangxinjiang's avatar fangxinjiang

社保公积金批量办理增加派单类型选项必填-fxj

parent 352a96cd
...@@ -70,4 +70,12 @@ public class FundImportHandleVo extends RowIndex implements Serializable { ...@@ -70,4 +70,12 @@ public class FundImportHandleVo extends RowIndex implements Serializable {
@ExcelProperty("失败类型" ) @ExcelProperty("失败类型" )
private String reasonType; private String reasonType;
/**
* 派单类型 0 派增 1 派减
*/
@ExcelAttribute(name = "派单类型",isNotEmpty = true)
@Schema(description = "派单类型 0 派增 1 派减" )
@ExcelProperty("派单类型" )
private String type;
} }
...@@ -114,4 +114,12 @@ public class SocialImportHandleVo extends RowIndex implements Serializable { ...@@ -114,4 +114,12 @@ public class SocialImportHandleVo extends RowIndex implements Serializable {
@ExcelProperty("失败类型" ) @ExcelProperty("失败类型" )
private String reasonType; private String reasonType;
/**
* 派单类型 0 派增 1 派减
*/
@ExcelAttribute(name = "派单类型",isNotEmpty = true)
@Schema(description = "派单类型 0 派增 1 派减" )
@ExcelProperty("派单类型" )
private String type;
} }
...@@ -6202,7 +6202,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6202,7 +6202,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
handleStatus = CommonConstants.TWO_STRING; handleStatus = CommonConstants.TWO_STRING;
} }
dispatch = dispatchMap.get(excel.getEmpIdcard()); dispatch = dispatchMap.get(excel.getEmpIdcard());
if (Common.isEmpty(dispatch)) { //批量办理增加派单类型 fxj 2025-04-24 V1.7.10
if (Common.isEmpty(dispatch) || excel.getType().equals(dispatch.getType())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.FUND_IMPORT_HANDLE_NOT_EXITS),excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.FUND_IMPORT_HANDLE_NOT_EXITS),excel));
continue; continue;
} }
...@@ -6368,7 +6369,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6368,7 +6369,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
dispatch = dispatchMap.get(excel.getEmpIdcard()); dispatch = dispatchMap.get(excel.getEmpIdcard());
if (Common.isEmpty(dispatch)) { //批量办理增加派单类型 fxj 2025-04-24 V1.7.10
if (Common.isEmpty(dispatch) || excel.getType().equals(dispatch.getType())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.SOCIAL_IMPORT_HANDLE_NOT_EXITS), excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.SOCIAL_IMPORT_HANDLE_NOT_EXITS), excel));
continue; continue;
} }
......
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