Commit d821cb31 authored by fangxinjiang's avatar fangxinjiang

公积金自动化-fxj

parent 035e968e
......@@ -838,20 +838,17 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return R.other(CommonConstants.THREE_INT,null,"获取公积金配置信息失败!");
}
}
//流程中的公积金数据不能修改
//(公积金待办为在途在保)流程中的公积金数据不能修改
//查已购买公积金明细
/*if (null != employeeRegistrationPre.getDispatchInfoFundPreVo() &&
Common.isEmpty(employeeRegistrationPre.getDispatchInfoFundPreVo().getId())) {
R<EmployeePreSocialListVo> fundSdr = socialDaprUtils.getFundPreInfoStatus(id);
if (null != employeeRegistrationPre.getDispatchInfoFundPreVo() &&
!Common.isEmpty(employeeRegistrationPre.getDispatchInfoFundPreVo().getId())) {
R<Boolean> fundSdr = socialDaprUtils.getFundPreStatus(employeeRegistrationPre.getDispatchInfoFundPreVo().getId());
//公积金购买状态,0待确认,1待派单,2派单失败,3待审核,4审核不通过,5待办理,7办理成功,8办理失败
if (fundSdr != null && fundSdr.getData() != null
&& null != fundSdr.getData().getDispatchInfoPreFundVo()
&& (fundSdr.getData().getDispatchInfoPreFundVo().getProcessStatus().equals(CommonConstants.THREE_STRING) ||
fundSdr.getData().getDispatchInfoPreFundVo().getProcessStatus().equals(CommonConstants.SEVEN_STRING) ||
fundSdr.getData().getDispatchInfoPreFundVo().getProcessStatus().equals(CommonConstants.FIVE_STRING))) {
if (fundSdr != null && null != fundSdr.getData()
&& fundSdr.getData().booleanValue()) {
return R.failed("流程中的公积金待购买数据不可修改!");
}
}*/
}
//更新合同签署状态
if (null != employeeRegistrationPre.getDispatchInfoFundPreVo()) {
employeeRegistrationPre.getDispatchInfoFundPreVo().setContractStatus(flag ? CommonConstants.ZERO_STRING : CommonConstants.ONE_STRING);
......
......@@ -315,7 +315,7 @@ public class SocialDaprUtils {
}
/**
* @Author huych
* @Author fxj
* @Description 获取公积金已购买信息
* @Date 2025-10-10 15:48:08
* @Param
......@@ -327,6 +327,19 @@ public class SocialDaprUtils {
, EmployeePreSocialListVo.class, SecurityConstants.FROM_IN);
}
/**
* @Author fxj
* @Description 获取公积金已购买信息 是否在途或在保
* @Date 2025-10-10 15:48:08
* @Param true 在途或在保 false 不在途不在保
* @return
**/
public R<Boolean> getFundPreStatus(String id){
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl()
, daprProperties.getAppId(),"/tdispatchinfopre/getFundPreStatus" , id
, Boolean.class, SecurityConstants.FROM_IN);
}
/**
* @Author huych
......
......@@ -315,6 +315,21 @@ public class TDispatchInfoPreController {
return tDispatchInfoPreService.getFundPreInfoStatus(id);
}
/**
* @Author fxj
* @Description 查询公积金待购买的状态:待审核、待办理、办理成功——为在途或在保 待确认 待派单 派单失败 审核不通过 办理失败 ——为不在途不在保
* @Date 9:47 2025/11/17
* @Param
* @return true 在途或在保 false 不在途不在保
**/
@Operation(description = "查询公积金待办的状态")
@Inner
@PostMapping("/getFundPreStatus")
public Boolean getFundPreStatus(@RequestBody String id) {
return tDispatchInfoPreService.getFundPreStatus(id);
}
/**
* 删除非流程中的社保待购买数据 公积金可以通用
* @author huych
......
......@@ -102,4 +102,6 @@ public interface TDispatchInfoPreService extends IService<TDispatchInfoPre> {
long getDispatchInfoFundCount(TDispatchInfoPreSearchVo searchVo);
R confirmFund(List<String> idList);
Boolean getFundPreStatus(String id);
}
......@@ -999,4 +999,27 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
}
return preSocialListVo;
}
/**
* @Author fxj
* @Description 查询公积金待待购买的状态:
* 待审核、待办理、办理成功——为在途或在保
* 待确认 待派单 派单失败 审核不通过 办理失败 ——为不在途不在保
* 公积金购买状态,0待确认,1待派单,2派单失败,3待审核,4审核不通过,5待办理,7办理成功,8办理失败
* @Date 9:50 2025/11/17
* @Param
* @return true: 在途 或 在保 false: 不在途不在保
**/
@Override
public Boolean getFundPreStatus(String id) {
//获取社保已购买信息
TDispatchInfoPre preExit = baseMapper.selectById(id);
if (Common.isNotNull(preExit)
&& (CommonConstants.THREE_STRING.equals(preExit.getProcessStatus())
|| CommonConstants.FIVE_STRING.equals(preExit.getProcessStatus())
|| CommonConstants.SEVEN_STRING.equals(preExit.getProcessStatus()) )) {
return true;
}
return false;
}
}
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