Commit cd082dd0 authored by hongguangwu's avatar hongguangwu

MVP1.7.6-SOCIAL_REDUCE_DATE 花名册 停缴日期

parent 3324b99e
...@@ -489,10 +489,10 @@ public class SocialHandleExportVo implements Serializable { ...@@ -489,10 +489,10 @@ public class SocialHandleExportVo implements Serializable {
private String leaveDate; private String leaveDate;
// 取 社保停缴日期 // 取 社保停缴日期
@ExcelAttribute(name = "停缴日期") @ExcelAttribute(name = "社保停缴日期")
@ContentStyle(dataFormat = 49) @ContentStyle(dataFormat = 49)
@Schema(description = "停缴日期") @Schema(description = "社保停缴日期")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("停缴日期" ) @ExcelProperty("社保停缴日期" )
private String socialReduceDate; private String socialReduceDate;
} }
...@@ -1280,7 +1280,7 @@ ...@@ -1280,7 +1280,7 @@
a.FIRST_PAY_TIME, 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", IF(a.LEAVE_DATE is not null,DATE_FORMAT(a.LEAVE_DATE,"%Y-%m-%d"),"") as "LEAVE_DATE",
IF(s.SOCIAL_REDUCE_DATE is not null,DATE_FORMAT(s.SOCIAL_REDUCE_DATE,"%Y-%m-%d"),"") as "SOCIAL_REDUCE_DATE" IF(a.SOCIAL_REDUCE_DATE is not null,DATE_FORMAT(a.SOCIAL_REDUCE_DATE,"%Y-%m-%d"),"") as "SOCIAL_REDUCE_DATE"
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id 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 left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment