Merge remote-tracking branch 'origin/MVP1.6.8' into MVP1.6.8

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

@@ -476,4 +476,15 @@ public class SocialHandleExportVo implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="首次至缴纳地时间")
 	private Date firstPayTime;
+
+	/**
+	 * 离职时间
+	 */
+	@ExcelAttribute(name = "首次至缴纳地时间",isDate = true)
+	@ContentStyle(dataFormat = 49)
+	@DateTimeFormat("yyyy-MM-dd")
+	@Schema(description = "离职时间")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("离职时间" )
+	private Date leaveDate;
 }

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

@@ -1181,6 +1181,7 @@
 		<result property="major" column="MAJOR"/>
 		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
 		<result property="graduationTime" column="GRADUATION_TIME"/>
+		<result property="leaveDate" column="LEAVE_DATE"/>
 	</resultMap>
 
 	<resultMap id="fundHandleMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.FundHandleExportVo">
@@ -1271,7 +1272,8 @@
 		a.SCHOOL_NAME,
 		a.MAJOR,
 		a.FIRST_PAY_TIME,
-		a.GRADUATION_TIME
+		a.GRADUATION_TIME,
+		a.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