Commit e40c0e72 authored by hongguangwu's avatar hongguangwu

MVP1.7.6-医保死亡转人工

parent 2181cd78
......@@ -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);
......
......@@ -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 '第四十四条第二项,劳动者开始依法享受基本养老保险待遇'
......
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