Commit bbb54dc1 authored by fangxinjiang's avatar fangxinjiang

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

parents e0a26b40 5ddb84ee
...@@ -1391,8 +1391,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1391,8 +1391,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//收取方式按年 且为指定月份时产生数据 //收取方式按年 且为指定月份时产生数据
if (CommonConstants.ZERO_STRING.equals(social.getCollectType()) && Common.isNotNull(socialSet)) { if (CommonConstants.ZERO_STRING.equals(social.getCollectType()) && Common.isNotNull(socialSet)) {
//按年收取大病方式按定值 //按年收取大病方式按定值
social.setPersonalBigailmentCardinal(BigDecimal.ZERO);
social.setUnitBigailmentCardinal(BigDecimal.ZERO);
social.setUnitBigailmentMoney(socialSet.getPayCompany()); social.setUnitBigailmentMoney(socialSet.getPayCompany());
social.setPersonalBigailmentMoney(socialSet.getPayPersonal()); social.setPersonalBigailmentMoney(socialSet.getPayPersonal());
} else if (CommonConstants.ONE_STRING.equals(social.getCollectType())) { } else if (CommonConstants.ONE_STRING.equals(social.getCollectType())) {
...@@ -1403,8 +1401,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1403,8 +1401,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
social.setPersonalBigailmentMoney(BigDecimalUtils.safeMultiply(social.getPersonalBigailmentCardinal(), social.getPersonalBigailmentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue()))); social.setPersonalBigailmentMoney(BigDecimalUtils.safeMultiply(social.getPersonalBigailmentCardinal(), social.getPersonalBigailmentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
} else if (CommonConstants.ZERO_STRING.equals(social.getValueType()) && Common.isNotNull(socialSet)) { } else if (CommonConstants.ZERO_STRING.equals(social.getValueType()) && Common.isNotNull(socialSet)) {
//收取大病方式按定值 //收取大病方式按定值
social.setPersonalBigailmentCardinal(BigDecimal.ZERO);
social.setUnitBigailmentCardinal(BigDecimal.ZERO);
social.setUnitBigailmentMoney(socialSet.getPayCompany()); social.setUnitBigailmentMoney(socialSet.getPayCompany());
social.setPersonalBigailmentMoney(socialSet.getPayPersonal()); social.setPersonalBigailmentMoney(socialSet.getPayPersonal());
} }
...@@ -1467,7 +1463,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1467,7 +1463,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
// 2022-8-9 15:26:20 新增逻辑:从不收取变为收取 // 2022-8-9 15:26:20 新增逻辑:从不收取变为收取
if (CommonConstants.ZERO_STRING.equals(sysBaseSetInfo.getIsIllness()) if (CommonConstants.ZERO_STRING.equals(sysBaseSetInfo.getIsIllness())
&& socialFundInfo.getBigailmentStart() == null && Common.isNotNull(socialFundInfo.getUnitPensionCardinal())) { && socialFundInfo.getBigailmentStart() == null && Common.isNotNull(socialFundInfo.getUnitPensionCardinal())) {
startDate = DateUtil.stringToDate(sysBaseSetInfo.getDoMonth(), "yyyyMM"); startDate = DateUtil.stringToDate(sysBaseSetInfo.getDoMonth() + "01", "yyyyMMdd");
socialFundInfo.setBigailmentHandle(CommonConstants.ONE_STRING); socialFundInfo.setBigailmentHandle(CommonConstants.ONE_STRING);
socialFundInfo.setBigailmentStart(startDate); socialFundInfo.setBigailmentStart(startDate);
} }
......
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