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
9b6eafeb
Commit
9b6eafeb
authored
Sep 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.15-死亡时间等
parent
3dbeb7e7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
0 deletions
+13
-0
SociaFriendYgsAddVo.java
...ifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
+4
-0
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+8
-0
TSocialFriendMapper.xml
...ial-biz/src/main/resources/mapper/TSocialFriendMapper.xml
+1
-0
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
View file @
9b6eafeb
...
...
@@ -193,4 +193,8 @@ public class SociaFriendYgsAddVo implements Serializable {
@ExcelProperty
(
"医保仅补缴生成材料"
)
private
String
dataFlagYsd
;
// ryszswrq 入狱/失踪/死亡日期 yyyy-MM-dd;
@ExcelProperty
(
"离职日"
)
private
String
leaveDay
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
9b6eafeb
...
...
@@ -563,6 +563,14 @@ public class SocialFriendConfig {
ybjyclArr
.
addAll
(
vo
.
getImgListYsd
());
}
tszdxx
.
put
(
"ybjycl"
,
ybjyclArr
);
if
(
type
==
4
&&
"16"
.
equals
(
vo
.
getTbyy
()))
{
// 生存状态变更类型
tszdxx
.
put
(
"scztbglx"
,
"死亡"
);
// 生存状态变更原因
tszdxx
.
put
(
"scztbgyy"
,
"死亡"
);
// 入狱/失踪/死亡日期 yyyy-MM-dd
tszdxx
.
put
(
"ryszswrq"
,
vo
.
getLeaveDay
());
}
}
else
{
if
(
Common
.
isNotNull
(
vo
.
getAutoLeaveDoc
()))
{
tszdxx
.
put
(
"shjycl"
,
vo
.
getAutoLeaveDoc
());
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendMapper.xml
View file @
9b6eafeb
...
...
@@ -290,6 +290,7 @@
a.IS_AUTO_LEAVE_DOC isAutoLeaveDoc,
DATE_FORMAT(a.LEAVE_DATE,'%Y年%m月%d日') leaveDate,
DATE_FORMAT(a.LEAVE_DATE,'%Y-%m-%d') leaveDay,
DATE_FORMAT(a.create_time,'%Y年%m月%d日') dispatchDate,
a.settle_domain deptId,
a.ID dispatchId
...
...
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