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
e40c0e72
Commit
e40c0e72
authored
Feb 12, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.6-医保死亡转人工
parent
2181cd78
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
32 deletions
+40
-32
TSocialFriendPushServiceImpl.java
...ifu/social/service/impl/TSocialFriendPushServiceImpl.java
+38
-30
TSocialFriendMapper.xml
...ial-biz/src/main/resources/mapper/TSocialFriendMapper.xml
+2
-2
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
View file @
e40c0e72
...
...
@@ -223,6 +223,13 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
R
<
String
>
urlR
;
for
(
SociaFriendYgsAddVo
vo
:
ysdAddlist
)
{
// 0:未到时间不动; 1:推送; 2:转人工
if
(
"劳动者死亡"
.
equals
(
vo
.
getTbyy
()))
{
remark
=
"劳动者死亡,转人工!"
;
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setYsdHandleStatus
(
CommonConstants
.
FIVE_STRING
);
renGongList
.
add
(
socialInfo
);
}
else
{
canPushType
=
this
.
getCanPushTypeYsd
(
socialSetMap
,
vo
);
if
(
1
==
canPushType
)
{
try
{
...
...
@@ -258,6 +265,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
renGongList
.
add
(
socialInfo
);
}
}
}
socialLog
=
tSocialSoldierLogService
.
getFriendLog
(
vo
,
typeStr
,
"医保"
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendMapper.xml
View file @
e40c0e72
...
...
@@ -75,7 +75,7 @@
when '2' then '无固定期限劳动合同'
else '固定期限劳动合同' end contractTypeTwo,
a.CONTRACT_END contractEnd,
if(a.REDUCE_REASON = '16','
死亡或失踪
','在职人员主动解除劳动合同') tbyy,
if(a.REDUCE_REASON = '16','
其他原因中断缴费
','在职人员主动解除劳动合同') tbyy,
case a.REDUCE_REASON
when '21' then '职工与用人单位协商一致解除劳动合同(18条1款)'
when '5' then '第四十四条第二项,劳动者开始依法享受基本养老保险待遇'
...
...
@@ -213,7 +213,7 @@
when '2' then '无固定期限劳动合同'
else '固定期限劳动合同' end contractTypeTwo,
a.CONTRACT_END contractEnd,
if(a.REDUCE_REASON = '16','
人员失踪
','在职人员解除/终止劳动合同') tbyy,
if(a.REDUCE_REASON = '16','
劳动者死亡
','在职人员解除/终止劳动合同') tbyy,
case a.REDUCE_REASON
when '21' then '职工与用人单位协商一致解除劳动合同(18条1款)'
when '5' then '第四十四条第二项,劳动者开始依法享受基本养老保险待遇'
...
...
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