Skip to content

Y
yifu-mvp
Commit 2d64af9b authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.5' into MVP1.5

parents 95a34de3 c6ee8f6f
Hide whitespace changes
Inline Side-by-side
Showing with 33 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 @ 2d64af9b
...@@ -3058,7 +3058,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3058,7 +3058,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} else if (CommonConstants.ONE_INT == flag) { } else if (CommonConstants.ONE_INT == flag) {
// 作废更新：社保状态、同步预估数据 8 审核不通过直接作废 // 作废更新：社保状态、同步预估数据 8 审核不通过直接作废
sf.setSocialReduceStatus(CommonConstants.ONE_STRING_NEGATE); sf.setSocialReduceStatus(CommonConstants.ONE_STRING_NEGATE);
sf.setSocialStatus(CommonConstants.THREE_STRING); if (CommonConstants.TWO_STRING.equals(sf.getPensionHandle())
|| CommonConstants.TWO_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.TWO_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.TWO_STRING.equals(sf.getBirthHandle())
|| CommonConstants.TWO_STRING.equals(sf.getUnemployHandle())
|| CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle())
){
sf.setSocialStatus(CommonConstants.FOUR_STRING);
}else {
sf.setSocialStatus(CommonConstants.THREE_STRING);
}
sf.setSocialReduceDate(null); sf.setSocialReduceDate(null);
} }
} }
...@@ -3459,7 +3469,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3459,7 +3469,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
continue; continue;
} }
socialInfo = socialMapper.selectById(dis.getSocialId()); socialInfo = socialMapper.selectById(dis.getSocialId());
socialTypeRemark = getHandleRemark(socialType, socialInfo,dis.getType()); socialTypeRemark = getHandleRemark(socialType, socialInfo,dis.getType(),sf);
// 无更新直接跳过 // 无更新直接跳过
if (Common.isEmpty(socialTypeRemark.toString())) { if (Common.isEmpty(socialTypeRemark.toString())) {
continue; continue;
...@@ -3898,7 +3908,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3898,7 +3908,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @Param socialType 派单项（1养老 2医疗 3失业 4工伤 5生育 6大病），socialInfo 社保信息 type 0 派增 1 派减 * @Param socialType 派单项（1养老 2医疗 3失业 4工伤 5生育 6大病），socialInfo 社保信息 type 0 派增 1 派减
* @return * @return
**/ **/
private StringBuilder getHandleRemark(String socialType, TSocialInfo socialInfo, String type) { private StringBuilder getHandleRemark(String socialType, TSocialInfo socialInfo, String type, TSocialFundInfo sf) {
StringBuilder socialTypeRemark; StringBuilder socialTypeRemark;
socialTypeRemark = new StringBuilder(); socialTypeRemark = new StringBuilder();
if (Common.isNotNull(socialType)) { if (Common.isNotNull(socialType)) {
...@@ -3938,28 +3948,27 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3938,28 +3948,27 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
for (String st : stArr) { for (String st : stArr) {
// socialType （1养老 2医疗 3失业 4工伤 5生育 6大病） // socialType （1养老 2医疗 3失业 4工伤 5生育 6大病）
if (Integer.parseInt(st) == CommonConstants.ONE_INT if (Integer.parseInt(st) == CommonConstants.ONE_INT
&& CommonConstants.FIVE_STRING.equals(socialInfo.getPensionHandle())){ && CommonConstants.FIVE_STRING.equals(sf.getPensionHandle())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、"); socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
} }
if (Integer.parseInt(st) == CommonConstants.TWO_INT if (Integer.parseInt(st) == CommonConstants.TWO_INT
&& CommonConstants.FIVE_STRING.equals(socialInfo.getMedicalHandle())){ && CommonConstants.FIVE_STRING.equals(sf.getMedicalHandle())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、"); socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
} }
if (Integer.parseInt(st) == CommonConstants.THREE_INT if (Integer.parseInt(st) == CommonConstants.THREE_INT
&& CommonConstants.FIVE_STRING.equals(socialInfo.getUnemployHandle())){ && CommonConstants.FIVE_STRING.equals(sf.getUnemployHandle())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、"); socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
} }
if (Integer.parseInt(st) == CommonConstants.FOUR_INT if (Integer.parseInt(st) == CommonConstants.FOUR_INT
&& CommonConstants.FIVE_STRING.equals(socialInfo.getWorkInjuryHandle())){ && CommonConstants.FIVE_STRING.equals(sf.getWorkInjuryHandle())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、"); socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
} }
if (Integer.parseInt(st) == CommonConstants.FIVE_INT if (Integer.parseInt(st) == CommonConstants.FIVE_INT
&& CommonConstants.FIVE_STRING.equals(socialInfo.getBirthHandle())){ && CommonConstants.FIVE_STRING.equals(sf.getBirthHandle())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、"); socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
} }
if (Integer.parseInt(st) == CommonConstants.SIX_INT if (Integer.parseInt(st) == CommonConstants.SIX_INT
&& CommonConstants.FIVE_STRING.equals(socialInfo.getBigailmentHandle()) && CommonConstants.FIVE_STRING.equals(sf.getBigailmentHandle())){
&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、"); socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
} }
} }
...@@ -4088,17 +4097,23 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4088,17 +4097,23 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private void initReduceStatus(TSocialInfo socialInfo, TSocialFundInfo sf, TDispatchInfo dis) { private void initReduceStatus(TSocialInfo socialInfo, TSocialFundInfo sf, TDispatchInfo dis) {
// 全部失败 // 全部失败
if ((CommonConstants.FOUR_STRING.equals(socialInfo.getPensionHandle()) if ((CommonConstants.FOUR_STRING.equals(socialInfo.getPensionHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getPensionHandle())
|| Common.isEmpty(socialInfo.getPensionHandle())) || Common.isEmpty(socialInfo.getPensionHandle()))
&& (CommonConstants.FOUR_STRING.equals(socialInfo.getMedicalHandle()) && (CommonConstants.FOUR_STRING.equals(socialInfo.getMedicalHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getMedicalHandle())
|| Common.isEmpty(socialInfo.getMedicalHandle())) || Common.isEmpty(socialInfo.getMedicalHandle()))
&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getWorkInjuryHandle()) && ( CommonConstants.FOUR_STRING.equals(socialInfo.getWorkInjuryHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getWorkInjuryHandle())
|| Common.isEmpty(socialInfo.getWorkInjuryHandle())) || Common.isEmpty(socialInfo.getWorkInjuryHandle()))
&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getBirthHandle()) && ( CommonConstants.FOUR_STRING.equals(socialInfo.getBirthHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getBirthHandle())
|| Common.isEmpty(socialInfo.getBirthHandle())) || Common.isEmpty(socialInfo.getBirthHandle()))
&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getUnemployHandle()) && ( CommonConstants.FOUR_STRING.equals(socialInfo.getUnemployHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getUnemployHandle())
|| Common.isEmpty(socialInfo.getUnemployHandle())) || Common.isEmpty(socialInfo.getUnemployHandle()))
&& ( && (
(CommonConstants.FOUR_STRING.equals(socialInfo.getBigailmentHandle()) ((CommonConstants.FOUR_STRING.equals(socialInfo.getBigailmentHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness()) && CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness())
) )
|| Common.isEmpty(socialInfo.getBigailmentHandle())) || Common.isEmpty(socialInfo.getBigailmentHandle()))
...@@ -4112,17 +4127,23 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4112,17 +4127,23 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
// 全部成功 // 全部成功
if ((CommonConstants.THREE_STRING.equals(socialInfo.getPensionHandle()) if ((CommonConstants.THREE_STRING.equals(socialInfo.getPensionHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getPensionHandle())
|| Common.isEmpty(socialInfo.getPensionHandle())) || Common.isEmpty(socialInfo.getPensionHandle()))
&& (CommonConstants.THREE_STRING.equals(socialInfo.getMedicalHandle()) && (CommonConstants.THREE_STRING.equals(socialInfo.getMedicalHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getMedicalHandle())
|| Common.isEmpty(socialInfo.getMedicalHandle())) || Common.isEmpty(socialInfo.getMedicalHandle()))
&& ( CommonConstants.THREE_STRING.equals(socialInfo.getWorkInjuryHandle()) && ( CommonConstants.THREE_STRING.equals(socialInfo.getWorkInjuryHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getWorkInjuryHandle())
|| Common.isEmpty(socialInfo.getWorkInjuryHandle())) || Common.isEmpty(socialInfo.getWorkInjuryHandle()))
&& ( CommonConstants.THREE_STRING.equals(socialInfo.getBirthHandle()) && ( CommonConstants.THREE_STRING.equals(socialInfo.getBirthHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getBirthHandle())
|| Common.isEmpty(socialInfo.getBirthHandle())) || Common.isEmpty(socialInfo.getBirthHandle()))
&& ( CommonConstants.THREE_STRING.equals(socialInfo.getUnemployHandle()) && ( CommonConstants.THREE_STRING.equals(socialInfo.getUnemployHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getUnemployHandle())
|| Common.isEmpty(socialInfo.getUnemployHandle())) || Common.isEmpty(socialInfo.getUnemployHandle()))
&& ( ( && ( (
CommonConstants.THREE_STRING.equals(socialInfo.getBigailmentHandle()) (CommonConstants.THREE_STRING.equals(socialInfo.getBigailmentHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness())) && CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness()))
|| Common.isEmpty(socialInfo.getBigailmentHandle())) || Common.isEmpty(socialInfo.getBigailmentHandle()))
){ ){
......
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