Commit 52eec605 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/develop' into develop

parents a416fa9a 9413798d
package com.yifu.cloud.plus.v1.yifu.social.vo; package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
...@@ -169,6 +171,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -169,6 +171,7 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 合同起始时间 * 合同起始时间
*/ */
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "合同起始时间", errorInfo = "合同起始时间不能为空",dateFormat = DateUtil.ISO_DATE_FORMAT,needExport = true) @ExcelAttribute(name = "合同起始时间", errorInfo = "合同起始时间不能为空",dateFormat = DateUtil.ISO_DATE_FORMAT,needExport = true)
@Schema(description = "合同起始时间") @Schema(description = "合同起始时间")
@ExcelProperty("合同起始时间" ) @ExcelProperty("合同起始时间" )
...@@ -176,6 +179,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -176,6 +179,7 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 合同到期时间 * 合同到期时间
*/ */
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "合同到期时间",needExport = true,dateFormat = DateUtil.ISO_DATE_FORMAT) @ExcelAttribute(name = "合同到期时间",needExport = true,dateFormat = DateUtil.ISO_DATE_FORMAT)
@Schema(description = "合同到期时间") @Schema(description = "合同到期时间")
@ExcelProperty("合同到期时间" ) @ExcelProperty("合同到期时间" )
...@@ -234,6 +238,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -234,6 +238,7 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 养老起缴日期 * 养老起缴日期
*/ */
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "养老起缴日期", needExport = true) @ExcelAttribute(name = "养老起缴日期", needExport = true)
@Schema(description="养老起缴日期") @Schema(description="养老起缴日期")
@ExcelProperty("养老起缴日期" ) @ExcelProperty("养老起缴日期" )
...@@ -250,6 +255,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -250,6 +255,7 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 医疗起缴日期 * 医疗起缴日期
*/ */
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "医疗起缴日期", needExport = true) @ExcelAttribute(name = "医疗起缴日期", needExport = true)
@Schema(description="医疗起缴日期") @Schema(description="医疗起缴日期")
@ExcelProperty("医疗起缴日期" ) @ExcelProperty("医疗起缴日期" )
...@@ -264,6 +270,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -264,6 +270,7 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 失业起缴日期 * 失业起缴日期
*/ */
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "失业起缴日期", needExport = true) @ExcelAttribute(name = "失业起缴日期", needExport = true)
@Schema(description="失业起缴日期") @Schema(description="失业起缴日期")
@ExcelProperty("失业起缴日期" ) @ExcelProperty("失业起缴日期" )
...@@ -278,6 +285,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -278,6 +285,7 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 工伤起缴日期 * 工伤起缴日期
*/ */
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "工伤起缴日期", needExport = true) @ExcelAttribute(name = "工伤起缴日期", needExport = true)
@Schema(description="工伤起缴日期") @Schema(description="工伤起缴日期")
@ExcelProperty("工伤起缴日期" ) @ExcelProperty("工伤起缴日期" )
...@@ -292,6 +300,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -292,6 +300,7 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 生育起缴日期 * 生育起缴日期
*/ */
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "生育起缴日期", needExport = true) @ExcelAttribute(name = "生育起缴日期", needExport = true)
@Schema(description="生育起缴日期") @Schema(description="生育起缴日期")
@ExcelProperty("生育起缴日期" ) @ExcelProperty("生育起缴日期" )
...@@ -306,6 +315,7 @@ public class SocialHandleExportVo implements Serializable { ...@@ -306,6 +315,7 @@ public class SocialHandleExportVo implements Serializable {
/** /**
* 大病起缴日期 * 大病起缴日期
*/ */
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "大病起缴日期", needExport = true) @ExcelAttribute(name = "大病起缴日期", needExport = true)
@Schema(description="大病起缴日期") @Schema(description="大病起缴日期")
@ExcelProperty("大病起缴日期" ) @ExcelProperty("大病起缴日期" )
......
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