Commit 68f4cd8b authored by huyuchen's avatar huyuchen

优化修改

parent 316a382d
...@@ -830,23 +830,10 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -830,23 +830,10 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
BigDecimal personalMedicalMoney; BigDecimal personalMedicalMoney;
// 个人失业金额 // 个人失业金额
BigDecimal personalUnemploymentMoney; BigDecimal personalUnemploymentMoney;
// 存储基数(最低或最高)
BigDecimal baseLimit;
if (socialInfo != null) { if (socialInfo != null) {
if (Common.isNotNull(socialInfo.getPaymentType()) && !CommonConstants.ONE_STRING.equals(socialInfo.getPaymentType())) { personalPersionBase = socialInfo.getPersonalPensionCardinal();
if (CommonConstants.ZERO_STRING.equals(socialInfo.getPaymentType())) { personalMedicalBase = socialInfo.getPersonalMedicalCardinal();
baseLimit = socialInfo.getLowerLimit(); personalUnemploymentBase = socialInfo.getPersonalUnemploymentCardinal();
} else {
baseLimit = socialInfo.getUpperLimit();
}
personalPersionBase = baseLimit;
personalMedicalBase = baseLimit;
personalUnemploymentBase = baseLimit;
} else {
personalPersionBase = socialInfo.getPersonalPensionCardinal();
personalMedicalBase = socialInfo.getPersonalMedicalCardinal();
personalUnemploymentBase = socialInfo.getPersonalUnemploymentCardinal();
}
if (historyLibrary != null) { if (historyLibrary != null) {
if (historyLibrary.getUnitPersionPro() != null) { if (historyLibrary.getUnitPersionPro() != null) {
personalPersionPro = historyLibrary.getPersonalPersionPro(); personalPersionPro = historyLibrary.getPersonalPersionPro();
...@@ -933,28 +920,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -933,28 +920,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
// 单位生育金额 // 单位生育金额
BigDecimal unitBirthMoney; BigDecimal unitBirthMoney;
// 存储基数(最低或最高)
BigDecimal baseLimit;
if (socialInfo != null) { if (socialInfo != null) {
// 需要从基数配置取数据: unitPersionBase = socialInfo.getUnitPensionCardinal();
if (Common.isNotNull(socialInfo.getPaymentType()) && !CommonConstants.ONE_STRING.equals(socialInfo.getPaymentType())) { unitMedicalBase = socialInfo.getUnitMedicalCardinal();
if (CommonConstants.ZERO_STRING.equals(socialInfo.getPaymentType())) { unitUnemploymentBase = socialInfo.getUnitUnemploymentCardinal();
baseLimit = socialInfo.getLowerLimit(); unitInjuryBase = socialInfo.getUnitWorkInjuryCardinal();
} else { unitBirthBase = socialInfo.getUnitBirthCardinal();
baseLimit = socialInfo.getUpperLimit();
}
unitPersionBase = baseLimit;
unitMedicalBase = baseLimit;
unitUnemploymentBase = baseLimit;
unitInjuryBase = baseLimit;
unitBirthBase = baseLimit;
} else {
unitPersionBase = socialInfo.getUnitPensionCardinal();
unitMedicalBase = socialInfo.getUnitMedicalCardinal();
unitUnemploymentBase = socialInfo.getUnitUnemploymentCardinal();
unitInjuryBase = socialInfo.getUnitWorkInjuryCardinal();
unitBirthBase = socialInfo.getUnitBirthCardinal();
}
if (historyLibrary != null) { if (historyLibrary != null) {
if (historyLibrary.getUnitPersionPro() != null) { if (historyLibrary.getUnitPersionPro() != null) {
unitPersionPro = historyLibrary.getUnitPersionPro(); unitPersionPro = historyLibrary.getUnitPersionPro();
...@@ -1139,16 +1110,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1139,16 +1110,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} }
//大病收取方式 : 1.按月 //大病收取方式 : 1.按月
} else if (CommonConstants.ONE_STRING.equals(socialInfo.getCollectType())) { } else if (CommonConstants.ONE_STRING.equals(socialInfo.getCollectType())) {
// 存储基数(最低或最高)
BigDecimal baseLimit = socialInfo.getLowerLimit();
if (CommonConstants.TWO_STRING.equals(paymentType)) {
baseLimit = socialInfo.getUpperLimit();
}
// 大病取值方式:1 按比例 按派单的基数和比例来 // 大病取值方式:1 按比例 按派单的基数和比例来
if (CommonConstants.ONE_STRING.equals(socialInfo.getValueType())) { if (CommonConstants.ONE_STRING.equals(socialInfo.getValueType())) {
library.setUnitBigailmentBase(baseLimit); library.setUnitBigailmentBase(socialInfo.getUnitBigailmentCardinal());
library.setUnitBigailmentPro(socialInfo.getUnitBigailmentPer()); library.setUnitBigailmentPro(socialInfo.getUnitBigailmentPer());
library.setPersonalBigailmentBase(baseLimit); library.setPersonalBigailmentBase(socialInfo.getPersonalBigailmentCardinal());
library.setPersonalBigailmentPro(socialInfo.getPersonalBigailmentPer()); library.setPersonalBigailmentPro(socialInfo.getPersonalBigailmentPer());
library.setPersonalBigailmentFee(socialInfo.getPersonalBigailmentMoney()); library.setPersonalBigailmentFee(socialInfo.getPersonalBigailmentMoney());
library.setUnitBitailmentFee(socialInfo.getUnitBigailmentMoney()); library.setUnitBitailmentFee(socialInfo.getUnitBigailmentMoney());
......
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