Skip to content

Y
yifu-mvp
Commit 95e01019 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5

parents 9ae167d2 68f4cd8b
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 50 deletions
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysBaseSetInfo.java
View file @ 95e01019
......@@ -231,7 +231,7 @@ public class SysBaseSetInfo extends BaseEntity {
@ExcelAttribute(name = "是否同一基数上下限: 0是；1否")
@Schema(description = "是否同一基数上下限: 0是；1否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否同一基数上下限: 0收取；1不收取")
@ExcelProperty("是否同一基数上下限: 0是；1否")
private String isSameBase;
/**
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 95e01019
......@@ -2600,12 +2600,24 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (CommonConstants.TWO_STRING.equals(excel.getPaymentType())){
excel.setPensionCardinal(socialSet.getUpPersion());
}
if (!CommonConstants.ONE_STRING.equals(excel.getPaymentType()) && Common.isEmpty(excel.getTrustRemark())
&& (excel.getPensionCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR)));
return true;
//最低最高时候去校验时候去校验
if (Common.isEmpty(excel.getTrustRemark()) && ((CommonConstants.ZERO_STRING.equals(excel.getPaymentType())
&& (socialSet.getLowerPersion().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
socialSet.getLowerMedical().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
socialSet.getLowerUnemployment().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
socialSet.getLowerInjury().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
socialSet.getLowerBirth().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
socialSet.getLowerBig().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)) ||
(CommonConstants.ONE_STRING.equals(excel.getPaymentType())
&& (socialSet.getUpPersion().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
socialSet.getUpMedical().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
socialSet.getUpUnemployment().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
socialSet.getUpInjury().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
socialSet.getUpBirth().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
socialSet.getUpBig().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)))){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR)));
return true;
}
}
return false;
}
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @ 95e01019
......@@ -830,23 +830,10 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
BigDecimal personalMedicalMoney;
// 个人失业金额
BigDecimal personalUnemploymentMoney;
// 存储基数（最低或最高）
BigDecimal baseLimit;
if (socialInfo != null) {
if (Common.isNotNull(socialInfo.getPaymentType()) && !CommonConstants.ONE_STRING.equals(socialInfo.getPaymentType())) {
if (CommonConstants.ZERO_STRING.equals(socialInfo.getPaymentType())) {
baseLimit = socialInfo.getLowerLimit();
} else {
baseLimit = socialInfo.getUpperLimit();
}
personalPersionBase = baseLimit;
personalMedicalBase = baseLimit;
personalUnemploymentBase = baseLimit;
} else {
personalPersionBase = socialInfo.getPersonalPensionCardinal();
personalMedicalBase = socialInfo.getPersonalMedicalCardinal();
personalUnemploymentBase = socialInfo.getPersonalUnemploymentCardinal();
}
personalPersionBase = socialInfo.getPersonalPensionCardinal();
personalMedicalBase = socialInfo.getPersonalMedicalCardinal();
personalUnemploymentBase = socialInfo.getPersonalUnemploymentCardinal();
if (historyLibrary != null) {
if (historyLibrary.getUnitPersionPro() != null) {
personalPersionPro = historyLibrary.getPersonalPersionPro();
......@@ -933,28 +920,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
// 单位生育金额
BigDecimal unitBirthMoney;
// 存储基数（最低或最高）
BigDecimal baseLimit;
if (socialInfo != null) {
// 需要从基数配置取数据：
if (Common.isNotNull(socialInfo.getPaymentType()) && !CommonConstants.ONE_STRING.equals(socialInfo.getPaymentType())) {
if (CommonConstants.ZERO_STRING.equals(socialInfo.getPaymentType())) {
baseLimit = socialInfo.getLowerLimit();
} else {
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();
}
unitPersionBase = socialInfo.getUnitPensionCardinal();
unitMedicalBase = socialInfo.getUnitMedicalCardinal();
unitUnemploymentBase = socialInfo.getUnitUnemploymentCardinal();
unitInjuryBase = socialInfo.getUnitWorkInjuryCardinal();
unitBirthBase = socialInfo.getUnitBirthCardinal();
if (historyLibrary != null) {
if (historyLibrary.getUnitPersionPro() != null) {
unitPersionPro = historyLibrary.getUnitPersionPro();
......@@ -1139,16 +1110,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
//大病收取方式 : 1.按月
} else if (CommonConstants.ONE_STRING.equals(socialInfo.getCollectType())) {
// 存储基数（最低或最高）
BigDecimal baseLimit = socialInfo.getLowerLimit();
if (CommonConstants.TWO_STRING.equals(paymentType)) {
baseLimit = socialInfo.getUpperLimit();
}
// 大病取值方式：1 按比例 按派单的基数和比例来
if (CommonConstants.ONE_STRING.equals(socialInfo.getValueType())) {
library.setUnitBigailmentBase(baseLimit);
library.setUnitBigailmentBase(socialInfo.getUnitBigailmentCardinal());
library.setUnitBigailmentPro(socialInfo.getUnitBigailmentPer());
library.setPersonalBigailmentBase(baseLimit);
library.setPersonalBigailmentBase(socialInfo.getPersonalBigailmentCardinal());
library.setPersonalBigailmentPro(socialInfo.getPersonalBigailmentPer());
library.setPersonalBigailmentFee(socialInfo.getPersonalBigailmentMoney());
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