Commit 6df329f2 authored by hongguangwu's avatar hongguangwu

大病从无到有,更新社保公积金查询

parent 96a0b130
......@@ -985,4 +985,8 @@ public class TSocialFundInfo extends BaseEntity {
@Schema(description = "派单ID" )
@ExcelProperty("派单ID" )
private String dispatchId;
// 执行月份,整体调基使用的
@TableField(exist = false)
private String doMonth;
}
......@@ -749,6 +749,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
// 大病处理: 0 收取 按派单的社保里的基数和比例来
if (CommonConstants.ZERO_STRING.equals(sysBaseSetInfo.getIsIllness())) {
// 大病收取方式 0.按年 判断当前月份是否收取大病 按年收大病起缴月份收取一次,非当年的 大病 按实际收取月份收取大病金额
this.setBigMoney(library, socialInfo, sysBaseSetInfo, socialInfo.getPaymentType());
// 大病处理: 1 不收取
} else {
......@@ -1427,13 +1428,21 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
if (sysBaseSetInfoList != null && !sysBaseSetInfoList.isEmpty()) {
Map<String, TSocialFundInfo> socialFundInfoMap = new HashMap<>();
List<TSocialFundInfo> socialFundInfoList;
Date startDate;
for (SysBaseSetInfo sysBaseSetInfo : sysBaseSetInfoList) {
// 社保
if (CommonConstants.ZERO_STRING.equals(sysBaseSetInfo.getBaseType())) {
socialFundInfoList = socialFundInfoMapper.selectList(Wrappers.<TSocialFundInfo>query().lambda()
.eq(TSocialFundInfo::getSocialHousehold, sysBaseSetInfo.getDepartId()));
for (TSocialFundInfo socialFundInfo : socialFundInfoList) {
// 2022-8-9 15:26:20 新增逻辑:从不收取变为收取
if (CommonConstants.ZERO_STRING.equals(sysBaseSetInfo.getIsIllness()) && socialFundInfo.getBigailmentStart() == null) {
startDate = DateUtil.stringToDate(sysBaseSetInfo.getDoMonth(), "yyyyMM");
socialFundInfo.setBigailmentHandle(CommonConstants.ONE_STRING);
socialFundInfo.setBigailmentStart(startDate);
}
this.changeSocialInfoByBase(socialFundInfo, sysBaseSetInfo);
socialFundInfo.setDoMonth(sysBaseSetInfo.getDoMonth());
socialFundInfoMap.put(socialFundInfo.getId(), socialFundInfo);
}
}
......@@ -1448,7 +1457,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
}
for (TSocialFundInfo socialFundInfo : socialFundInfoMap.values()) {
this.updateForecastLibaryCore(socialFundInfo, null);
this.updateForecastLibaryCore(socialFundInfo, socialFundInfo.getDoMonth());
socialFundInfoMapper.updateById(socialFundInfo);
}
}
......
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