MVP1.6.8-转人工等

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

@@ -477,6 +477,16 @@ public class SocialSoldierExportVo implements Serializable {
 	@ExcelProperty(value = "首次至缴纳地时间")
 	private Date firstPayTime;
 
+	/**
+	 * 离职日期
+	 */
+	@ExcelAttribute(name = "离职日期")
+	@ContentStyle(dataFormat = 49)
+	@Schema(description = "离职日期")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("离职日期" )
+	private String leaveDate;
+
 	@ExcelAttribute(name = "养老工伤失业-办理状态", readConverterExp = "0=无,1=待办理,2=自动办理中,3=继续办理,4=中止办理,5=人工处理,6=成功,7=提交成功", needExport = true)
 	@Schema(description = "养老工伤失业-办理状态")
 	@HeadFontStyle(fontHeightInPoints = 11)

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

@@ -1126,6 +1126,7 @@
 		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
 		<result property="graduationTime" column="GRADUATION_TIME"/>
 
+		<result property="leaveDate" column="LEAVE_DATE"/>
 		<result property="ygsHandleStatus" column="ygs_Handle_Status"/>
 		<result property="ysdHandleStatus" column="ysd_Handle_Status"/>
 		<result property="ygsRemark" column="YGS_REMARK"/>
@@ -1334,7 +1335,8 @@
 		a.SCHOOL_NAME,
 		a.MAJOR,
 		a.FIRST_PAY_TIME,
-		a.GRADUATION_TIME
+		a.GRADUATION_TIME,
+		IF(a.LEAVE_DATE is not null,DATE_FORMAT(a.LEAVE_DATE,"%Y-%m-%d"),"") as "LEAVE_DATE"
 		,s.ygs_Handle_Status
 		,s.ysd_Handle_Status
 		,s.YGS_REMARK