自动化办理审核 导出

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java

@@ -522,10 +522,10 @@ public class TDispatchInfoExportVo {
 	private Date firstPayTime;
 
 	/**
-	 * 社保自动化标识 0 是  1  否
+	 * 社保自动化标识 0 是  1  否 2 无
 	 */
-	@ExcelAttribute(name = "是否自动化审核",isNotEmpty = false)
-	@Schema(description = "是否自动化审核:0 是  1  否" )
+	@ExcelAttribute(name = "是否自动化审核",isNotEmpty = false,readConverterExp = "0=是,1=否,2=无")
+	@Schema(description = "是否自动化审核:0 是  1  否2 无" )
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="是否自动化审核")
 	private String autoFlag;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialDeadlineInfoServiceImpl.java

@@ -284,8 +284,10 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
 			for (TSocialDeadlineInfo sd:baseLists){
 				save = new TSocialDeadlineInfo();
 				BeanUtil.copyProperties(sd,save);
+				save.setId(null);
 				initSocialEndDate(holidayMap, save);
 				initMedicalEndDate(holidayMap, save);
+				saveList.add(save);
 			}
 			if (Common.isNotNull(saveList)){
 				this.saveBatch(saveList);