Skip to content

Y
yifu-mvp
Commit e3377b5a authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

common 调优

parent c297f232
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 12 deletions
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ e3377b5a
......@@ -604,17 +604,28 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
vo.setDepartNo(socialFund.getSettleDomainCodeFund());
}
// 有一个办理成功重新派单的 即为办理中
if (Common.isNotNull(socialFund) &&
(CommonConstants.ONE_STRING.equals(socialFund.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(socialFund.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(socialFund.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(socialFund.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(socialFund.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(socialFund.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialFund.getIsIllness())))
){
vo.setSocialStatus(CommonConstants.ONE_STRING);
boolean flagTemp = Common.isNotNull(socialFund) && Common.isNotNull(socialFund.getSocialId())
&& (CommonConstants.ONE_STRING.equals(socialFund.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(socialFund.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(socialFund.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(socialFund.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(socialFund.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(socialFund.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialFund.getIsIllness())))
&& !(CommonConstants.ONE_STRING.equals(socialFund.getPensionHandle())
&& CommonConstants.ONE_STRING.equals(socialFund.getMedicalHandle())
&& CommonConstants.ONE_STRING.equals(socialFund.getWorkInjuryHandle())
&& CommonConstants.ONE_STRING.equals(socialFund.getBirthHandle())
&& CommonConstants.ONE_STRING.equals(socialFund.getUnemployHandle())
&& (
(CommonConstants.ONE_STRING.equals(socialFund.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialFund.getIsIllness()))
||(CommonConstants.ONE_STRING.equals(socialFund.getIsIllness()))
));
if (Common.isNotNull(socialFund) && flagTemp){
vo.setSocialStatus(CommonConstants.TWO_STRING);
}
vo.setEmpIdCard(socialFund.getEmpIdcard());
R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()){
......@@ -2489,7 +2500,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(excel.getSocialReduceDate())){
dispatch.setSocialHandleStatus(CommonConstants.ZERO_STRING);
dispatch.setSocialId(socialFund.getSocialId());
dispatch.setProvidentHouseholdName(socialFund.getProvidentHouseholdName());
dispatch.setSocialHouseholdName(socialFund.getSocialHouseholdName());
dispatch.setSocialProvince(socialFund.getSocialProvince());
dispatch.setSocialCity(socialFund.getSocialCity());
dispatch.setSocialTown(socialFund.getSocialTown());
......@@ -2526,7 +2537,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
dispatch.setFundHandleStatus(CommonConstants.ZERO_STRING);
dispatch.setFundId(socialFund.getFundId());
dispatch.setFundId(socialFund.getProvidentHouseholdName());
dispatch.setProvidentHouseholdName(socialFund.getProvidentHouseholdName());
dispatch.setFundProvince(socialFund.getFundProvince());
dispatch.setFundCity(socialFund.getFundCity());
dispatch.setFundTown(socialFund.getFundTown());
......
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