Commit f66ea281 authored by hongguangwu's avatar hongguangwu

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

parents dc61abfc 79506681
...@@ -1984,6 +1984,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1984,6 +1984,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<TInsuranceDetail> successList = new ArrayList<>(); List<TInsuranceDetail> successList = new ArrayList<>();
List<TInsuranceDetail> successOne = new ArrayList<>(); List<TInsuranceDetail> successOne = new ArrayList<>();
List<TInsuranceDetail> successTwo = new ArrayList<>(); List<TInsuranceDetail> successTwo = new ArrayList<>();
//见费出单已经生成预估数据了不用推送了
List<TInsuranceDetail> successThree = new ArrayList<>();
List<TInsuranceDetail> successBanlance = new ArrayList<>(); List<TInsuranceDetail> successBanlance = new ArrayList<>();
//被替换人标记被替换成功 //被替换人标记被替换成功
List<TInsuranceDetail> sourceList = new ArrayList<>(); List<TInsuranceDetail> sourceList = new ArrayList<>();
...@@ -2140,6 +2142,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2140,6 +2142,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail.setUpdateTime(LocalDateTime.now()); detail.setUpdateTime(LocalDateTime.now());
detail.setUpdateBy(user.getId()); detail.setUpdateBy(user.getId());
successTwo.add(detail); successTwo.add(detail);
successThree.add(detail);
} }
} }
//实缴 //实缴
...@@ -2211,7 +2214,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2211,7 +2214,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (CollectionUtils.isNotEmpty(successList)) { if (CollectionUtils.isNotEmpty(successList)) {
// 异步任务操作档案的 商险状态为:2正常(0无2正常3失效4处理中) // 异步任务操作档案的 商险状态为:2正常(0无2正常3失效4处理中)
doJointInsuranceTask.updateEmpInfp(successList, CommonConstants.TWO_STRING); doJointInsuranceTask.updateEmpInfp(successList, CommonConstants.TWO_STRING);
//从successList中排查 successThree 的数据 这部分不同推送
if (Common.isNotNull(successThree)){
successList.removeAll(successThree);
}
//异步任务推送 //异步任务推送
doJointInsuranceTask.pushEstime(successList); doJointInsuranceTask.pushEstime(successList);
} }
......
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