Commit 9e54e0ca authored by hongguangwu's avatar hongguangwu

MVP1.6.4-优化社保士兵

parent 6f9e646b
...@@ -3434,8 +3434,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3434,8 +3434,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
||CommonConstants.ZERO_STRING.equals(socialInfo.getWorkInjuryHandle()) ||CommonConstants.ZERO_STRING.equals(socialInfo.getWorkInjuryHandle())
||CommonConstants.FIVE_STRING.equals(socialInfo.getWorkInjuryHandle()) ||CommonConstants.FIVE_STRING.equals(socialInfo.getWorkInjuryHandle())
||CommonConstants.ZERO_STRING.equals(socialInfo.getUnemployHandle()) ||CommonConstants.ZERO_STRING.equals(socialInfo.getUnemployHandle())
||CommonConstants.FIVE_STRING.equals(socialInfo.getUnemployHandle()) ||CommonConstants.FIVE_STRING.equals(socialInfo.getUnemployHandle()))
&& CommonConstants.ZERO_STRING.equals(autoFlag))){ && CommonConstants.ZERO_STRING.equals(autoFlag)) {
socialInfo.setYgsHandleStatus(CommonConstants.ONE_STRING); socialInfo.setYgsHandleStatus(CommonConstants.ONE_STRING);
} }
if ((CommonConstants.ZERO_STRING.equals(socialInfo.getMedicalHandle()) if ((CommonConstants.ZERO_STRING.equals(socialInfo.getMedicalHandle())
...@@ -3443,9 +3443,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3443,9 +3443,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
||CommonConstants.ZERO_STRING.equals(socialInfo.getBirthHandle()) ||CommonConstants.ZERO_STRING.equals(socialInfo.getBirthHandle())
||CommonConstants.FIVE_STRING.equals(socialInfo.getBirthHandle()) ||CommonConstants.FIVE_STRING.equals(socialInfo.getBirthHandle())
||CommonConstants.ZERO_STRING.equals(socialInfo.getBigailmentHandle()) ||CommonConstants.ZERO_STRING.equals(socialInfo.getBigailmentHandle())
||CommonConstants.FIVE_STRING.equals(socialInfo.getBigailmentHandle()) ||CommonConstants.FIVE_STRING.equals(socialInfo.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(autoFlag))){ && CommonConstants.ZERO_STRING.equals(autoFlag)) {
socialInfo.setYgsHandleStatus(CommonConstants.ONE_STRING); socialInfo.setYsdHandleStatus(CommonConstants.ONE_STRING);
} }
} }
socialMapper.updateById(socialInfo); socialMapper.updateById(socialInfo);
......
...@@ -384,8 +384,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -384,8 +384,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
if (typeFlag && if (typeFlag &&
(CommonConstants.ONE_STRING.equals(socialInfo.getYgsHandleStatus()) (CommonConstants.ONE_STRING.equals(socialInfo.getYgsHandleStatus())
|| CommonConstants.TWO_STRING.equals(socialInfo.getYgsHandleStatus()) || CommonConstants.TWO_STRING.equals(socialInfo.getYgsHandleStatus())
|| CommonConstants.THREE_STRING.equals(socialInfo.getYgsHandleStatus()) || CommonConstants.THREE_STRING.equals(socialInfo.getYgsHandleStatus()))) {
|| CommonConstants.FIVE_STRING.equals(socialInfo.getYgsHandleStatus()))) {
updateSocial = socialMap.get(socialInfo.getId()); updateSocial = socialMap.get(socialInfo.getId());
if (updateSocial == null) { if (updateSocial == null) {
updateSocial = new TSocialInfo(); updateSocial = new TSocialInfo();
...@@ -473,8 +472,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -473,8 +472,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
} else if (!typeFlag && } else if (!typeFlag &&
(CommonConstants.ONE_STRING.equals(socialInfo.getYsdHandleStatus()) (CommonConstants.ONE_STRING.equals(socialInfo.getYsdHandleStatus())
|| CommonConstants.TWO_STRING.equals(socialInfo.getYsdHandleStatus()) || CommonConstants.TWO_STRING.equals(socialInfo.getYsdHandleStatus())
|| CommonConstants.THREE_STRING.equals(socialInfo.getYsdHandleStatus()) || CommonConstants.THREE_STRING.equals(socialInfo.getYsdHandleStatus()))) {
|| CommonConstants.FIVE_STRING.equals(socialInfo.getYsdHandleStatus()))) {
updateSocial = socialMap.get(socialInfo.getId()); updateSocial = socialMap.get(socialInfo.getId());
if (updateSocial == null) { if (updateSocial == null) {
updateSocial = new TSocialInfo(); updateSocial = new TSocialInfo();
......
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