档案问题修改

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

@@ -176,7 +176,22 @@ public class TDispatchAuditExportVo {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("减少原因" )
 	private String reduceReason;
-
+	/**
+	 * 社保起缴日期
+	 */
+	@ExcelAttribute(name = "社保起缴日期", isDate = true)
+	@Schema(description = "社保起缴日期" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("社保起缴日期" )
+	private Date socialStartDate;
+	/**
+	 * 公积金起缴日期
+	 */
+	@ExcelAttribute(name = "公积金起缴日期", isDate = true)
+	@Schema(description = "公积金起缴日期" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("公积金起缴日期" )
+	private Date providentStart;
 	/**
 	 * 社保停缴日期
 	 */

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

@@ -178,7 +178,9 @@
 		<result property="personalUnemploymentCardinal" column="PERSONAL_UNEMPLOYMENT_CARDINAL"/>
 		<result property="personalBigailmentMoney" column="PERSONAL_BIGAILMENT_MONEY"/>
 		<result property="unitBigailmentMoney" column="UNIT_BIGAILMENT_MONEY"/>
+		<result property="socialStartDate" column="SOCIAL_START_DATE"/>
 
+		<result property="providentStart" column="PROVIDENT_START"/>
 		<result property="unitProvidengCardinal" column="UNIT_PROVIDENG_CARDINAL"/>
 		<result property="personalProvidentCardinal" column="PERSONAL_PROVIDENT_CARDINAL"/>
 		<result property="unitProvidentPer" column="UNIT_PROVIDENT_PER"/>
@@ -630,6 +632,7 @@
 		a.FUND_REDUCE_DATE,
 		a.LEAVE_DATE,
 		a.REDUCE_REASON,
+		b.SOCIAL_START_DATE,
 		b.PAYMENT_TYPE,
 		b.RECORD_BASE,
 		b.UNIT_PENSION_CARDINAL,
@@ -643,6 +646,7 @@
 		b.PERSONAL_BIGAILMENT_MONEY,
 		b.UNIT_BIGAILMENT_MONEY,
 		c.UNIT_PROVIDENG_CARDINAL,
+		c.PROVIDENT_START,
 		c.PERSONAL_PROVIDENT_CARDINAL,
 		c.UNIT_PROVIDENT_PER,
 		c.PERSONAL_PROVIDENT_PER