Commit 7ea6731b authored by huyuchen's avatar huyuchen

优化修改

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