Commit 06e9ea49 authored by hongguangwu's avatar hongguangwu

社保预估大病数据优化

parent 0e64b36a
...@@ -757,8 +757,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -757,8 +757,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
* @Date: 2020/11/25 15:51 * @Date: 2020/11/25 15:51
* @return: void * @return: void
**/ **/
private void initLibraryBigMoneyBySocial(TForecastLibrary library, TSocialFundInfo socialInfo private void initLibraryBigMoneyBySocial(TForecastLibrary library, TSocialFundInfo socialInfo) {
) { int libraryPayMonth = Integer.parseInt(library.getSocialPayMonth());
if (socialInfo.getBigailmentStart() != null && libraryPayMonth >= DateUtil.formatDateInt(socialInfo.getBigailmentStart())) {
if (CommonConstants.ONE_STRING.equals(socialInfo.getPaymentType())) { if (CommonConstants.ONE_STRING.equals(socialInfo.getPaymentType())) {
// 自定义类型大病随基数配置变化:0不随配置 1随配置 2.单位大病随配置 3个人大病随配置 // 自定义类型大病随基数配置变化:0不随配置 1随配置 2.单位大病随配置 3个人大病随配置
// 2022-7-20 11:46:32 与房工沟通,派单没这个逻辑,所以都是随配置直接计算 // 2022-7-20 11:46:32 与房工沟通,派单没这个逻辑,所以都是随配置直接计算
...@@ -779,6 +780,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -779,6 +780,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} }
} }
} }
}
/** /**
* 初始化单位和个人的预估数据 * 初始化单位和个人的预估数据
...@@ -1997,7 +1999,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1997,7 +1999,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//封装社保预估数据 //封装社保预估数据
if (Common.isNotNull(socialInfoList)) { if (Common.isNotNull(socialInfoList)) {
for (TSocialFundInfo tSocialInfo : socialInfoList) { for (TSocialFundInfo tSocialInfo : socialInfoList) {
minStartDate = this.getMinDate(tSocialInfo); minStartDate = this.getMinSocialDate(tSocialInfo);
createMonth = ServiceUtil.initCreateMonth(tSocialInfo.getCreateTime(), payMonth); createMonth = ServiceUtil.initCreateMonth(tSocialInfo.getCreateTime(), payMonth);
sfMapKey = this.getMapKey(tSocialInfo.getEmpIdcard(), tSocialInfo.getSettleDomain(), payMonth, createMonth, CommonConstants.ZERO_STRING); sfMapKey = this.getMapKey(tSocialInfo.getEmpIdcard(), tSocialInfo.getSettleDomain(), payMonth, createMonth, CommonConstants.ZERO_STRING);
......
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