feature-wzb :公积金停缴日期导出

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

@@ -3,6 +3,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.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;
@@ -128,6 +129,18 @@ public class FundHandleExportVo implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("公积金起缴日期" )
 	private LocalDateTime providentStart;
+
+
+	/**
+	 * 公积金停缴日期
+	 */
+
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "公积金停缴日期", isDate = true,needExport = true)
+	@Schema(description = "公积金停缴日期" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("公积金停缴日期" )
+	private Date fundReduceDate;
     /**
      * 单位公积金缴纳基数
      */

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

@@ -978,7 +978,7 @@
 		<result property="empMobile" column="EMP_MOBILE"/>
 		<result property="idCardAddress" column="ID_CARD_ADDRESS"/>
 		<result property="createUserName" column="CREATE_NAME"/>
-
+		<result property="fundReduceDate" column="FUND_REDUCE_DATE"/>
 		<result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/>
 		<result property="providentStart" column="PROVIDENT_START"/>
 		<result property="unitProvidengCardinal" column="UNIT_PROVIDENG_CARDINAL"/>
@@ -1158,10 +1158,10 @@
 		a.EMP_MOBILE,
 		a.ID_CARD_ADDRESS,
 		a.CREATE_NAME,
-
 		a.PROVIDENT_HOUSEHOLD_NAME,
 		f.PROVIDENT_START,
 		f.UNIT_PROVIDENG_CARDINAL,
+		f.FUND_REDUCE_DATE,
 		f.PERSONAL_PROVIDENT_CARDINAL,
 		f.UNIT_PROVIDENT_PER,
 		f.PERSONAL_PROVIDENT_PER,