Commit 34a8b4d9 authored by hongguangwu's avatar hongguangwu

MVP1.7.10-自动化办理查询的状态

parent d0adac0d
...@@ -652,14 +652,14 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -652,14 +652,14 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
&& Common.isNotNull(socialInfo.getYsdHandleStatus()) && Common.isNotNull(socialInfo.getYsdHandleStatus())
&& CommonConstants.FIVE_STRING.equals(socialInfo.getYsdHandleStatus())) { && CommonConstants.FIVE_STRING.equals(socialInfo.getYsdHandleStatus())) {
// 医生大状态为待办理或派减待办理 // 医生大状态为待办理或派减待办理
if (CommonConstants.ZERO_STRING.equals(socialInfo.getPensionHandle()) if (CommonConstants.ZERO_STRING.equals(socialInfo.getMedicalHandle())
|| CommonConstants.FIVE_STRING.equals(socialInfo.getPensionHandle()) || CommonConstants.FIVE_STRING.equals(socialInfo.getMedicalHandle())
|| CommonConstants.ZERO_STRING.equals(socialInfo.getWorkInjuryHandle()) || CommonConstants.ZERO_STRING.equals(socialInfo.getBirthHandle())
|| CommonConstants.FIVE_STRING.equals(socialInfo.getWorkInjuryHandle()) || CommonConstants.FIVE_STRING.equals(socialInfo.getBirthHandle())
|| CommonConstants.ZERO_STRING.equals(socialInfo.getUnemployHandle()) || CommonConstants.ZERO_STRING.equals(socialInfo.getBigailmentHandle())
|| CommonConstants.FIVE_STRING.equals(socialInfo.getUnemployHandle())) { || CommonConstants.FIVE_STRING.equals(socialInfo.getBigailmentHandle())) {
socialInfo.setYsdHandleStatus(CommonConstants.ONE_STRING); socialInfo.setYsdHandleStatus(CommonConstants.ONE_STRING);
handleRemark += "医疗、生育、大病手动转自动化"; handleRemark += "医疗、生育、大病手动转自动化";
canUpdate = true; canUpdate = true;
...@@ -695,7 +695,11 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -695,7 +695,11 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
, CommonConstants.ONE_STRING); , CommonConstants.ONE_STRING);
return R.ok("成功"); return R.ok("成功");
} else { } else {
return R.failed("【"+handleRemark+"】状态未变更,请刷新后查看列表状态!"); if (Common.isNotNull(handleRemark) && handleRemark.length() > 2) {
return R.failed("【"+handleRemark+"】状态未变更,请刷新后查看列表状态!");
} else {
return R.failed("状态未变更,请刷新后查看列表状态!");
}
} }
} }
......
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