Commit 9788c3db authored by fangxinjiang's avatar fangxinjiang

代码优化+待建档拒绝入职在途商险查询-fxj

parent 5b881a02
...@@ -258,6 +258,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -258,6 +258,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
@Override @Override
public R updateRegistById(EmployeeRegistrationPre employeeRegistrationPre) { public R updateRegistById(EmployeeRegistrationPre employeeRegistrationPre) {
EmployeeRegistrationPre updatePre = baseMapper.selectById(employeeRegistrationPre.getId()); EmployeeRegistrationPre updatePre = baseMapper.selectById(employeeRegistrationPre.getId());
//状态:0短信待发送,1信息待填写,2信息待审核,3拒绝入职,4已完成
if (Common.isEmpty(updatePre) || (updatePre.getProcessStatus().equals(CommonConstants.THREE_STRING) if (Common.isEmpty(updatePre) || (updatePre.getProcessStatus().equals(CommonConstants.THREE_STRING)
|| updatePre.getProcessStatus().equals(CommonConstants.FOUR_STRING))) { || updatePre.getProcessStatus().equals(CommonConstants.FOUR_STRING))) {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE); return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
......
...@@ -1013,8 +1013,10 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -1013,8 +1013,10 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
if (Common.isEmpty(registId)){ if (Common.isEmpty(registId)){
return R.failed(CommonConstants.PARAM_INFO_ERROR); return R.failed(CommonConstants.PARAM_INFO_ERROR);
} }
//状态,0待确认,1待派单,2派单失败,3待投保,4投保中,5投保退回,6已完成,7待缴费
//返回在途数据 3待投保,4投保中,7待缴费
return R.ok(baseMapper.selectOne(Wrappers.<TEmployeeInsurancePre>query().lambda() return R.ok(baseMapper.selectOne(Wrappers.<TEmployeeInsurancePre>query().lambda()
.notIn(TEmployeeInsurancePre::getProcessStatus, Arrays.asList("0","1","2","5")) .in(TEmployeeInsurancePre::getProcessStatus, Arrays.asList("3","4","7"))
.eq(TEmployeeInsurancePre::getRegisterId, registId).last(CommonConstants.LAST_ONE_SQL))); .eq(TEmployeeInsurancePre::getRegisterId, registId).last(CommonConstants.LAST_ONE_SQL)));
} }
} }
...@@ -2307,8 +2307,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2307,8 +2307,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
if (CollectionUtils.isNotEmpty(successList)) { if (CollectionUtils.isNotEmpty(successList)) {
// 异步任务操作档案的 商险状态为:2正常(0无2正常3失效4处理中) // 异步任务操作档案的 商险状态为:2正常(0无2正常3失效4处理中)
doJointInsuranceTask.updateEmpInfp(successList, CommonConstants.TWO_STRING); // 2026-03-12因为有空指针,查看发现下面对successList.removeAll(successThree)导致的:
//从successList中排查 successThree 的数据 这部分不同推送 List<TInsuranceDetail> updateStatusList = new ArrayList<>(successList);
doJointInsuranceTask.updateEmpInfp(updateStatusList, CommonConstants.TWO_STRING);
//从successList中排查 successThree 的数据 这部分不用推送
if (Common.isNotNull(successThree)){ if (Common.isNotNull(successThree)){
successList.removeAll(successThree); successList.removeAll(successThree);
} }
......
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