社保花名册导出增加离职日期-fxj

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

@@ -4,6 +4,7 @@ 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.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.ExcelAttributeConstants;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -480,11 +481,10 @@ public class SocialHandleExportVo implements Serializable {
 	/**
 	 * 离职时间
 	 */
-	@ExcelAttribute(name = "首次至缴纳地时间",isDate = true)
+	@ExcelAttribute(name = "离职时间")
 	@ContentStyle(dataFormat = 49)
-	@DateTimeFormat("yyyy-MM-dd")
 	@Schema(description = "离职时间")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("离职时间" )
-	private Date leaveDate;
+	private String leaveDate;
 }

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -1217,7 +1217,7 @@
 		a.MAJOR,
 		a.FIRST_PAY_TIME,
 		a.GRADUATION_TIME,
-		a.LEAVE_DATE
+		IF(a.LEAVE_DATE is not null,DATE_FORMAT(a.LEAVE_DATE,"%Y-%m-%d"),"") as "LEAVE_DATE"
 		FROM t_dispatch_info a
 		left join t_social_info s on a.SOCIAL_ID = s.id
 		left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID