社保花名册 导出日志为文本格式调整

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

@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
@@ -191,21 +192,21 @@ public class SocialHandleExportVo implements Serializable {
 	/**
 	 * 合同起始时间
 	 */
+	@ContentStyle(dataFormat = 49)
 	@DateTimeFormat("yyyy-MM-dd")
-	@ExcelAttribute(name = "合同起始时间",  errorInfo = "合同起始时间不能为空",dateFormat = DateUtil.ISO_DATE_FORMAT,needExport = true)
 	@Schema(description = "合同起始时间")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("合同起始时间" )
-	private Date contractStart;
+	private String contractStart;
 	/**
 	 * 合同到期时间
 	 */
+	@ContentStyle(dataFormat = 49)
 	@DateTimeFormat("yyyy-MM-dd")
-	@ExcelAttribute(name = "合同到期时间",needExport = true,dateFormat = DateUtil.ISO_DATE_FORMAT)
 	@Schema(description = "合同到期时间")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("合同到期时间" )
-	private Date contractEnd;
+	private String contractEnd;
 	/**
 	 * 创建人姓名
 	 */
@@ -267,12 +268,13 @@ public class SocialHandleExportVo implements Serializable {
 	/**
 	 * 养老起缴日期
 	 */
+	@ContentStyle(dataFormat = 49)
 	@DateTimeFormat("yyyy-MM-dd")
 	@ExcelAttribute(name = "养老起缴日期", needExport = true)
 	@Schema(description="养老起缴日期")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("养老起缴日期" )
-	private Date pensionStart;;
+	private String pensionStart;;
 
 	/**
 	 * 养老基数
@@ -286,12 +288,13 @@ public class SocialHandleExportVo implements Serializable {
     /**
      * 医疗起缴日期
      */
+	@ContentStyle(dataFormat = 49)
 	@DateTimeFormat("yyyy-MM-dd")
     @ExcelAttribute(name = "医疗起缴日期", needExport = true)
     @Schema(description="医疗起缴日期")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("医疗起缴日期" )
-    private Date medicalStart;
+    private String medicalStart;
 	/**
 	 * 医疗基数
 	 */
@@ -303,12 +306,13 @@ public class SocialHandleExportVo implements Serializable {
     /**
      * 失业起缴日期
      */
+	@ContentStyle(dataFormat = 49)
 	@DateTimeFormat("yyyy-MM-dd")
     @ExcelAttribute(name = "失业起缴日期", needExport = true)
     @Schema(description="失业起缴日期")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("失业起缴日期" )
-    private Date unemployStart;
+    private String unemployStart;
 	/**
 	 * 失业基数
 	 */
@@ -320,12 +324,13 @@ public class SocialHandleExportVo implements Serializable {
     /**
      * 工伤起缴日期
      */
+	@ContentStyle(dataFormat = 49)
 	@DateTimeFormat("yyyy-MM-dd")
     @ExcelAttribute(name = "工伤起缴日期", needExport = true)
     @Schema(description="工伤起缴日期")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("工伤起缴日期" )
-    private Date workInjuryStart;
+    private String workInjuryStart;
 	/**
 	 * 工伤基数
 	 */
@@ -337,12 +342,13 @@ public class SocialHandleExportVo implements Serializable {
     /**
      * 生育起缴日期
      */
+	@ContentStyle(dataFormat = 49)
 	@DateTimeFormat("yyyy-MM-dd")
     @ExcelAttribute(name = "生育起缴日期", needExport = true)
     @Schema(description="生育起缴日期")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("生育起缴日期" )
-    private Date birthStart;
+    private String birthStart;
 	/**
 	 * 生育基数
 	 */
@@ -354,12 +360,13 @@ public class SocialHandleExportVo implements Serializable {
     /**
      * 大病起缴日期
      */
+	@ContentStyle(dataFormat = 49)
 	@DateTimeFormat("yyyy-MM-dd")
     @ExcelAttribute(name = "大病起缴日期", needExport = true)
     @Schema(description="大病起缴日期")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("大病起缴日期" )
-    private Date bigailmentStart;
+    private String bigailmentStart;
 	/**
 	 * 大病缴纳基数
 	 */