Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
cd082dd0
Commit
cd082dd0
authored
Jan 23, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.6-SOCIAL_REDUCE_DATE 花名册 停缴日期
parent
3324b99e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
SocialHandleExportVo.java
...fu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
+3
-3
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+1
-1
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
View file @
cd082dd0
...
...
@@ -489,10 +489,10 @@ public class SocialHandleExportVo implements Serializable {
private
String
leaveDate
;
// 取 社保停缴日期
@ExcelAttribute
(
name
=
"停缴日期"
)
@ExcelAttribute
(
name
=
"
社保
停缴日期"
)
@ContentStyle
(
dataFormat
=
49
)
@Schema
(
description
=
"停缴日期"
)
@Schema
(
description
=
"
社保
停缴日期"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"停缴日期"
)
@ExcelProperty
(
"
社保
停缴日期"
)
private
String
socialReduceDate
;
}
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
cd082dd0
...
...
@@ -1280,7 +1280,7 @@
a.FIRST_PAY_TIME,
a.GRADUATION_TIME,
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
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment