Commit 5d89cbb5 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/master'

parents e07dfc1a 4ef5badc
...@@ -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; // 明确退出条件
......
...@@ -958,11 +958,12 @@ public class DoJointSocialTask { ...@@ -958,11 +958,12 @@ public class DoJointSocialTask {
List<EkpPushSocialParam> insertList = new ArrayList<>(); List<EkpPushSocialParam> insertList = new ArrayList<>();
try { try {
for (TForecastLibrary library : unPushInfo) { for (TForecastLibrary library : unPushInfo) {
if (Common.isNotNull(library.getDeptNo())) {
//获取项目信息 //获取项目信息
settleDomain = selectVoMap.get(library.getDeptNo()); settleDomain = selectVoMap.get(library.getDeptNo());
if (Common.isEmpty(settleDomain)) { if (Common.isEmpty(settleDomain)) {
// 抛出异常错误,通过邮件提醒处理 // 抛出异常错误,通过邮件提醒处理
log.error("获取结算主体("+library.getDeptNo()+")异常,请检查传参和档案服务状态!"); log.error("获取结算主体(" + library.getDeptNo() + ")异常,请检查传参和档案服务状态!");
continue; continue;
//ServiceUtil.runTimeExceptionDiy("获取结算主体异常,请检查传参和档案服务状态!"); //ServiceUtil.runTimeExceptionDiy("获取结算主体异常,请检查传参和档案服务状态!");
} }
...@@ -1196,12 +1197,13 @@ public class DoJointSocialTask { ...@@ -1196,12 +1197,13 @@ public class DoJointSocialTask {
} }
//缴纳地拼接 //缴纳地拼接
StringBuilder adress = new StringBuilder(); StringBuilder adress = new StringBuilder();
adress.append(null!= library.getSocialProvince() ? RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialProvince()) : "") adress.append(null != library.getSocialProvince() ? RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialProvince()) : "")
.append(null!= library.getSocialCity() ? "_" + RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialCity()) : "") .append(null != library.getSocialCity() ? "_" + RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialCity()) : "")
.append(null!= library.getSocialTown() ? "_" + RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialTown()) : ""); .append(null != library.getSocialTown() ? "_" + RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialTown()) : "");
socialParam.setFd_3b5cc58d1a70fe(adress.toString()); socialParam.setFd_3b5cc58d1a70fe(adress.toString());
insertList.add(socialParam); insertList.add(socialParam);
} }
}
if (!insertList.isEmpty()) { if (!insertList.isEmpty()) {
R<EkpSocialPushInfoVo> info = ekpDaprUtil.pushSocialInfoToEkp(insertList); R<EkpSocialPushInfoVo> info = ekpDaprUtil.pushSocialInfoToEkp(insertList);
if (Common.isNotNull(info) && Common.isNotNull(info.getData())) { if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
......
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