Commit e3b13b9c authored by fangxinjiang's avatar fangxinjiang

社保及公积金批量办理导入添加派单类型必填-fxj

parent 968d1106
...@@ -73,7 +73,7 @@ public class FundImportHandleVo extends RowIndex implements Serializable { ...@@ -73,7 +73,7 @@ public class FundImportHandleVo extends RowIndex implements Serializable {
/** /**
* 派单类型 0 派增 1 派减 * 派单类型 0 派增 1 派减
*/ */
@ExcelAttribute(name = "派单类型",isNotEmpty = true) @ExcelAttribute(name = "派单类型",isNotEmpty = true,isDataId = true,readConverterExp = "0=派增,1=派减",errorInfo = "派单类型不可为空")
@Schema(description = "派单类型 0 派增 1 派减" ) @Schema(description = "派单类型 0 派增 1 派减" )
@ExcelProperty("派单类型" ) @ExcelProperty("派单类型" )
private String type; private String type;
......
...@@ -117,7 +117,7 @@ public class SocialImportHandleVo extends RowIndex implements Serializable { ...@@ -117,7 +117,7 @@ public class SocialImportHandleVo extends RowIndex implements Serializable {
/** /**
* 派单类型 0 派增 1 派减 * 派单类型 0 派增 1 派减
*/ */
@ExcelAttribute(name = "派单类型",isNotEmpty = true) @ExcelAttribute(name = "派单类型",isNotEmpty = true,isDataId = true,readConverterExp = "0=派增,1=派减",errorInfo = "派单类型不可为空")
@Schema(description = "派单类型 0 派增 1 派减" ) @Schema(description = "派单类型 0 派增 1 派减" )
@ExcelProperty("派单类型" ) @ExcelProperty("派单类型" )
private String type; private String type;
......
...@@ -6203,7 +6203,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6203,7 +6203,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
dispatch = dispatchMap.get(excel.getEmpIdcard()); dispatch = dispatchMap.get(excel.getEmpIdcard());
//批量办理增加派单类型 fxj 2025-04-24 V1.7.10 //批量办理增加派单类型 fxj 2025-04-24 V1.7.10
if (Common.isEmpty(dispatch) || excel.getType().equals(dispatch.getType())) { 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;
} }
...@@ -6370,7 +6370,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -6370,7 +6370,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch = dispatchMap.get(excel.getEmpIdcard()); dispatch = dispatchMap.get(excel.getEmpIdcard());
//批量办理增加派单类型 fxj 2025-04-24 V1.7.10 //批量办理增加派单类型 fxj 2025-04-24 V1.7.10
if (Common.isEmpty(dispatch) || excel.getType().equals(dispatch.getType())) { 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