Commit 1268d7ee authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/develop' into develop

parents 3423d42b f36ae495
...@@ -8181,7 +8181,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -8181,7 +8181,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
@Override @Override
public R<Integer> getUserInsuranceMessageWarnCount(String userName) { public R<Integer> getUserInsuranceMessageWarnCount(String userName) {
InsuranceSearchVo searchVo = new InsuranceSearchVo(); InsuranceSearchVo searchVo = new InsuranceSearchVo();
searchVo.setCreateBy(SecurityUtils.getUser().getId()); searchVo.setAlertId(SecurityUtils.getUser().getId());
searchVo.setExpireIgnoreFlag(CommonConstants.ONE_STRING); searchVo.setExpireIgnoreFlag(CommonConstants.ONE_STRING);
return R.ok(baseMapper.noPageCountDiy(searchVo)); return R.ok(baseMapper.noPageCountDiy(searchVo));
} }
......
...@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain; import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
...@@ -2195,7 +2196,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2195,7 +2196,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
while (true) { while (true) {
pageInfo = new Page<>(page, pageSize); pageInfo = new Page<>(page, pageSize);
batch = socialFundInfoMapper.selectPage(pageInfo, batch = socialFundInfoMapper.selectPage(pageInfo,
Wrappers.<TSocialFundInfo>query().lambda()).getRecords(); Wrappers.<TSocialFundInfo>query().lambda()
.and(obj -> obj.isNotNull(TSocialFundInfo::getSettleDomainCode)
.or()
.isNotNull(TSocialFundInfo::getSettleDomainCodeFund)
)
).getRecords();
if (batch == null || batch.isEmpty()) { if (batch == null || batch.isEmpty()) {
break; // 明确退出条件 break; // 明确退出条件
...@@ -2204,7 +2210,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2204,7 +2210,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
// 并行处理,确保线程安全性 // 并行处理,确保线程安全性
batch.parallelStream().forEach(socialFundInfo -> { batch.parallelStream().forEach(socialFundInfo -> {
try { try {
everyMonthCreateForecastLibaryCore(payMonth, socialFundInfo,mapSelectVo); // 异常场景:有公积金无社保数据,可通过身份证或结算主体页面重新生成数据
String deptNo = null == socialFundInfo.getSettleDomainCode()?socialFundInfo.getSettleDomainCodeFund():socialFundInfo.getSettleDomainCode();
if (Common.isNotNull(deptNo) && null != mapSelectVo.get(deptNo)){
everyMonthCreateForecastLibaryCore(payMonth, socialFundInfo,mapSelectVo);
}
} catch (Exception e) { } catch (Exception e) {
// 捕获并记录单个处理中的异常,避免影响其他数据 // 捕获并记录单个处理中的异常,避免影响其他数据
log.error("Error processing socialFundInfo: " + socialFundInfo.getId() + ", Exception: " + e.getMessage()); log.error("Error processing socialFundInfo: " + socialFundInfo.getId() + ", Exception: " + e.getMessage());
...@@ -2339,7 +2349,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2339,7 +2349,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
List<TForecastLibrary> libraryFundInfoListSocial = new ArrayList<>(); List<TForecastLibrary> libraryFundInfoListSocial = new ArrayList<>();
List<TForecastLibrary> libraryFundInfoListFund = new ArrayList<>(); List<TForecastLibrary> libraryFundInfoListFund = new ArrayList<>();
//社保收入 //社保收入
//Map<String,TSettleDomainSelectVo> mapSelectVo = this.getSelectVoMap();
String redisKey = String.valueOf(UUID.randomUUID()).replaceAll("-", "") + "_incomePush"; String redisKey = String.valueOf(UUID.randomUUID()).replaceAll("-", "") + "_incomePush";
if (Common.isNotNull(socialFundInfo.getSocialId()) if (Common.isNotNull(socialFundInfo.getSocialId())
&& CommonConstants.FOUR_STRING.equals(socialFundInfo.getSocialStatus()) && CommonConstants.FOUR_STRING.equals(socialFundInfo.getSocialStatus())
......
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