Commit 7cc96a23 authored by fangxinjiang's avatar fangxinjiang

社保自动化跨越继续办理更新成中止办理-fxj

parent 4f861fd3
...@@ -276,5 +276,15 @@ public class SocialTask { ...@@ -276,5 +276,15 @@ public class SocialTask {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tsocialsoldier/inner/doInnerGetPaymentThree","", Object.class, SecurityConstants.FROM_IN); HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tsocialsoldier/inner/doInnerGetPaymentThree","", Object.class, SecurityConstants.FROM_IN);
log.info("------------7每月6号3点定时任务获取社保士兵实缴3张表-定时任务结束------------"); log.info("------------7每月6号3点定时任务获取社保士兵实缴3张表-定时任务结束------------");
} }
/**
* @Author fxj
* @Description 定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理
* @Date 10:45 2025/7/14
**/
public void doChangeHandleStatusToEnd() {
log.info("------------定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理-定时任务开始------------");
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),
"/tsocialfriend/inner/doChangeHandleStatusToEnd","", Object.class, SecurityConstants.FROM_IN);
log.info("------------定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理-定时任务结束------------");
}
} }
...@@ -166,4 +166,18 @@ public class TSocialFriendController { ...@@ -166,4 +166,18 @@ public class TSocialFriendController {
} }
} }
/**
* @Author fxj
* @Description 定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理
* @Date 10:40 2025/7/14
* @Param
* @return
**/
@Operation(description = "定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理")
@PostMapping("/inner/doChangeHandleStatusToEnd")
@SysLog("定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理")
@Inner
public void doChangeHandleStatusToEnd() {
tSocialFriendService.changeSocialHandndleStatus();
}
} }
...@@ -53,6 +53,9 @@ public interface TSocialInfoMapper extends BaseMapper<TSocialInfo> { ...@@ -53,6 +53,9 @@ public interface TSocialInfoMapper extends BaseMapper<TSocialInfo> {
List<TSocialInfo> getSocialFriendYgsAll(); List<TSocialInfo> getSocialFriendYgsAll();
List<TSocialInfo> getSocialFriendYsdAll(); List<TSocialInfo> getSocialFriendYsdAll();
List<TSocialInfo> getSocialFriendYgsAllTask();
List<TSocialInfo> getSocialFriendYsdAllTask();
/** /**
* @param * @param
* @Description: 获取所有需要社保局审核的社保 * @Description: 获取所有需要社保局审核的社保
......
...@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service; ...@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import org.springframework.transaction.annotation.Transactional;
/** /**
* 社保士兵 * 社保士兵
...@@ -37,4 +38,6 @@ public interface TSocialFriendService extends IService<TSocialInfo> { ...@@ -37,4 +38,6 @@ public interface TSocialFriendService extends IService<TSocialInfo> {
**/ **/
R<String> getInfoByRequestId(); R<String> getInfoByRequestId();
@Transactional
void changeSocialHandndleStatus();
} }
...@@ -70,6 +70,9 @@ public interface TSocialInfoService extends IService<TSocialInfo> { ...@@ -70,6 +70,9 @@ public interface TSocialInfoService extends IService<TSocialInfo> {
List<TSocialInfo> getSocialFriendYgsAll(); List<TSocialInfo> getSocialFriendYgsAll();
List<TSocialInfo> getSocialFriendYsdAll(); List<TSocialInfo> getSocialFriendYsdAll();
List<TSocialInfo> getSocialFriendYgsAllTask();
List<TSocialInfo> getSocialFriendYsdAllTask();
/** /**
* @Description: 获取所有需要审核结果的社保 * @Description: 获取所有需要审核结果的社保
* @Author: hgw * @Author: hgw
......
...@@ -34,6 +34,7 @@ import lombok.extern.log4j.Log4j2; ...@@ -34,6 +34,7 @@ import lombok.extern.log4j.Log4j2;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import java.util.*; import java.util.*;
...@@ -529,5 +530,65 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -529,5 +530,65 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
auditInfo.setSocialId(social.getId()); auditInfo.setSocialId(social.getId());
tAuditInfoService.save(auditInfo); tAuditInfoService.save(auditInfo);
} }
/**
* @Author fxj
* @Description 获取 医生大、养工伤 数据 跨月的继续办理更新为中止办理
* @Date 9:43 2025/7/14
* @Param
* @return
**/
@Transactional
@Override
public void changeSocialHandndleStatus() {
List<TSocialInfo> ygsList = tSocialInfoService.getSocialFriendYgsAllTask();
String handleStatus = CommonConstants.TWO_STRING;
List<String> ygsFailList = new ArrayList<>();
List<String> ysdFailList = new ArrayList<>();
String handleRemark = "中止办理:系统定时任务更新跨月继续办理为终止办理";
String ygsHandleStatus = CommonConstants.FOUR_STRING;;
TSocialInfo updateSocial;
Set<String> dbAuthsSet = new HashSet<>();
Collection<? extends GrantedAuthority> authorities = AuthorityUtils
.createAuthorityList(dbAuthsSet.toArray(new String[0]));
YifuUser user = new YifuUser("1", null, "", "admin", "管理员", "",
"", "", false, false, false,
false, "", authorities, "", null,
null, "", null);
String typeSub = CommonConstants.ZERO_STRING;
if (ygsList != null && !ygsList.isEmpty()){
for (TSocialInfo socialInfo : ygsList) {
ygsFailList.add(socialInfo.getDispatchId());
updateSocial = new TSocialInfo();
updateSocial.setId(socialInfo.getId());
updateSocial.setYgsHandleStatus(ygsHandleStatus);
// 处理社保办理成功或失败,
if (Common.isNotNull(updateSocial.getId())) {
tSocialInfoService.updateById(updateSocial);
}
}
}
List<TSocialInfo> ysdList = tSocialInfoService.getSocialFriendYsdAllTask();
if (ysdList != null && !ysdList.isEmpty()) {
for (TSocialInfo socialInfo : ysdList) {
ysdFailList.add(socialInfo.getDispatchId());
updateSocial = new TSocialInfo();
updateSocial.setId(socialInfo.getId());
updateSocial.setYsdHandleStatus(ygsHandleStatus);
// 处理社保办理成功或失败,
if (Common.isNotNull(updateSocial.getId())) {
tSocialInfoService.updateById(updateSocial);
}
}
}
String socialType;
// 处理社保办理成功后的状态同步-失败
if (!ygsFailList.isEmpty()) {
socialType = "1,4,3";
this.doSocialAndDispatch(ygsFailList, typeSub, handleStatus, handleRemark, socialType, handleRemark, user);
}
if (!ysdFailList.isEmpty()) {
socialType = "2,5,6";
this.doSocialAndDispatch(ysdFailList, typeSub, handleStatus, handleRemark, socialType, handleRemark, user);
}
}
} }
...@@ -706,5 +706,26 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -706,5 +706,26 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
} }
} }
} }
/**
* @Author fxj
* @Description 获取养工失跨月继续办理的数据
* @Date 9:50 2025/7/14
* @Param
* @return
**/
@Override
public List<TSocialInfo> getSocialFriendYgsAllTask() {
return baseMapper.getSocialFriendYgsAllTask();
}
/**
* @Author fxj
* @Description 获取医生大跨月继续办理的数据
* @Date 9:49 2025/7/14
* @Param
* @return
**/
@Override
public List<TSocialInfo> getSocialFriendYsdAllTask() {
return baseMapper.getSocialFriendYsdAllTask();
}
} }
...@@ -1357,8 +1357,8 @@ ...@@ -1357,8 +1357,8 @@
,s.YGS_REMARK ,s.YGS_REMARK
,s.YSD_REMARK ,s.YSD_REMARK
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID ,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
,if(a.type ='0',DATE_FORMAT(YGS_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YGS_SOCIAL_START_DATE_NEXT ,if(a.type ='0',DATE_FORMAT(YGS_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',DATE_FORMAT(YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YSD_SOCIAL_START_DATE_NEXT ,if(a.type ='0',DATE_FORMAT(YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),null) YSD_SOCIAL_START_DATE_NEXT
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
...@@ -1429,8 +1429,8 @@ ...@@ -1429,8 +1429,8 @@
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK ,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID ,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID ,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='0',DATE_FORMAT(YGS_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YGS_SOCIAL_START_DATE_NEXT ,if(a.type ='0',DATE_FORMAT(YGS_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',DATE_FORMAT(YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YSD_SOCIAL_START_DATE_NEXT ,if(a.type ='0',DATE_FORMAT(YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),null) YSD_SOCIAL_START_DATE_NEXT
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
...@@ -1600,8 +1600,8 @@ ...@@ -1600,8 +1600,8 @@
,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS ,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS
,s.YGS_REMARK,s.YSD_REMARK,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD ,s.YGS_REMARK,s.YSD_REMARK,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID ,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,'') YGS_SOCIAL_START_DATE_NEXT ,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,'') YSD_SOCIAL_START_DATE_NEXT ,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT
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
...@@ -1699,8 +1699,8 @@ ...@@ -1699,8 +1699,8 @@
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK ,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID ,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID ,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,'') YGS_SOCIAL_START_DATE_NEXT ,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,'') YSD_SOCIAL_START_DATE_NEXT ,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT
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
......
...@@ -749,4 +749,48 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id ...@@ -749,4 +749,48 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id
where a.YGS_ADD_ID = #{addId} or a.YSD_ADD_ID = #{addId} where a.YGS_ADD_ID = #{addId} or a.YSD_ADD_ID = #{addId}
</select> </select>
<!-- 获取所有需要自动办理的养工失:跨约继续办理更新为中止办理 -->
<select id="getSocialFriendYgsAllTask" resultMap="tSocialInfoMap">
SELECT
a.ID,
a.EMP_NAME,
a.SOCIAL_HOUSEHOLD_NAME,
a.EMP_IDCARD,
a.YGS_REQUEST_ID,
a.HANDLE_STATUS,
a.YGS_HANDLE_STATUS,
SUBSTRING_INDEX(GROUP_CONCAT(d.id ORDER BY d.CREATE_TIME desc),',',1) as DISPATCH_ID,
SUBSTRING_INDEX(GROUP_CONCAT(d.type ORDER BY d.CREATE_TIME desc),',',1) as DISPATCH_TYPE
FROM t_social_info a
left join t_dispatch_info d on d.SOCIAL_ID = a.id
where a.YGS_REQUEST_ID is not null and a.YGS_REQUEST_ID != '' and a.YGS_REQUEST_ID != '-' and d.AUTO_FLAG='0'
and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 MONTH),'%Y%m')
and a.YGS_HANDLE_STATUS ='3'
group by a.id
order by a.YGS_REQUEST_ID asc
</select>
<!-- 获取所有需要自动办理的医生大:跨约继续办理更新为中止办理 -->
<select id="getSocialFriendYsdAllTask" resultMap="tSocialInfoMap">
SELECT
a.ID,
a.EMP_NAME,
a.SOCIAL_HOUSEHOLD_NAME,
a.EMP_IDCARD,
a.YSD_REQUEST_ID,
a.HANDLE_STATUS,
a.YSD_HANDLE_STATUS,
a.SOCIAL_START_DATE,
a.YSD_SOCIAL_START_DATE_NEXT,
SUBSTRING_INDEX(GROUP_CONCAT(d.id ORDER BY d.CREATE_TIME desc),',',1) as DISPATCH_ID,
SUBSTRING_INDEX(GROUP_CONCAT(d.type ORDER BY d.CREATE_TIME desc),',',1) as DISPATCH_TYPE
FROM t_social_info a
left join t_dispatch_info d on d.SOCIAL_ID = a.id
where a.YSD_REQUEST_ID is not null and a.YSD_REQUEST_ID != '' and a.YSD_REQUEST_ID != '-' and d.AUTO_FLAG='0'
and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 MONTH),'%Y%m')
and a.YSD_HANDLE_STATUS = '3'
group by a.id
order by a.YSD_REQUEST_ID asc
</select>
</mapper> </mapper>
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