Commit 7ea6731b authored by huyuchen's avatar huyuchen

优化修改

parent cd467bc9
...@@ -1272,12 +1272,19 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1272,12 +1272,19 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} else if (social.getUnitBirthCardinal().compareTo(socialSet.getUpBirth()) > CommonConstants.ZERO_INT) { } else if (social.getUnitBirthCardinal().compareTo(socialSet.getUpBirth()) > CommonConstants.ZERO_INT) {
social.setUnitBirthCardinal(socialSet.getUpBirth()); social.setUnitBirthCardinal(socialSet.getUpBirth());
} }
if (social.getUnitBigailmentCardinal().compareTo(socialSet.getLowerBig()) < CommonConstants.ZERO_INT) { if (CommonConstants.ONE_STRING.equals(social.getCollectType())
social.setPersonalBigailmentCardinal(socialSet.getLowerBig()); && CommonConstants.ONE_STRING.equals(social.getValueType())) {
social.setUnitBigailmentCardinal(socialSet.getLowerBig()); if (social.getUnitBigailmentCardinal().compareTo(socialSet.getLowerBig()) < CommonConstants.ZERO_INT) {
} else if (social.getUnitBigailmentCardinal().compareTo(socialSet.getUpBig()) > CommonConstants.ZERO_INT) { //按年收取大病方式按定值
social.setPersonalBigailmentCardinal(socialSet.getUpBig()); social.setPersonalBigailmentCardinal(socialSet.getLowerBig());
social.setUnitBigailmentCardinal(socialSet.getUpBig()); social.setUnitBigailmentCardinal(socialSet.getLowerBig());
} else if (social.getUnitBigailmentCardinal().compareTo(socialSet.getUpBig()) > CommonConstants.ZERO_INT) {
social.setPersonalBigailmentCardinal(socialSet.getUpBig());
social.setUnitBigailmentCardinal(socialSet.getUpBig());
}
}else {
social.setPersonalBigailmentCardinal(BigDecimal.ZERO);
social.setUnitBigailmentCardinal(BigDecimal.ZERO);
} }
} else if (social.getUnitWorkInjuryCardinal() != null) { } else if (social.getUnitWorkInjuryCardinal() != null) {
// 兼职工伤 // 兼职工伤
......
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