Commit bb0bb5c8 authored by fangxinjiang's avatar fangxinjiang

优化-fxj

parent e4ff02aa
...@@ -2429,6 +2429,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2429,6 +2429,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail.setUpdateBy(user.getId()); detail.setUpdateBy(user.getId());
successTwo.add(detail); successTwo.add(detail);
successThree.add(detail); successThree.add(detail);
updateEmployeeInsurancePreById(detail, Stream.of("4").collect(Collectors.toList()),CommonConstants.SIX_STRING);
updateEmployeeInsurancePreRenewById(detail, Stream.of("4").collect(Collectors.toList()),CommonConstants.SIX_STRING, false);
} }
} }
//实缴 //实缴
...@@ -10075,8 +10077,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -10075,8 +10077,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.eq(TEmployeeInsurancePre::getInsurancesId,insuranceDetail.getId()) .eq(TEmployeeInsurancePre::getInsurancesId,insuranceDetail.getId())
.in(TEmployeeInsurancePre::getProcessStatus,preStatusList) .in(TEmployeeInsurancePre::getProcessStatus,preStatusList)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isEmpty(pre) && CommonConstants.SIX_STRING.equals(status)) {
pre = employeeInsurancePreMapper.selectOne(Wrappers.<TEmployeeInsurancePre>query().lambda()
.eq(TEmployeeInsurancePre::getInsurancesId, insuranceDetail.getId())
.in(TEmployeeInsurancePre::getProcessStatus, Arrays.asList("3", "4", "7"))
.last(CommonConstants.LAST_ONE_SQL));
}
if (Common.isNotNull(pre)) { if (Common.isNotNull(pre)) {
pre.setProcessStatus(status); pre.setProcessStatus(status);
if (Common.isEmpty(pre.getInsurancesId())) {
pre.setInsurancesId(insuranceDetail.getId());
}
employeeInsurancePreMapper.updateById(pre); employeeInsurancePreMapper.updateById(pre);
} }
} }
......
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