Commit 0de3410b authored by hongguangwu's avatar hongguangwu

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

# Conflicts:
#	yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
parents 3d17a2fa 89fa8e43
...@@ -482,10 +482,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -482,10 +482,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
this.doFailInfo(detailList, sourceIdCardList, replaceIdList, CommonConstants.FOUR_STRING); this.doFailInfo(detailList, sourceIdCardList, replaceIdList, CommonConstants.FOUR_STRING);
//插入结算数据 //插入结算数据
if (!settleList.isEmpty()) { /*if (!settleList.isEmpty()) {
tInsuranceSettleService.saveBatch(settleList); tInsuranceSettleService.saveBatch(settleList);
settleList.clear(); settleList.clear();
} }*/
} }
//操作记录 //操作记录
if (!isAuto) { if (!isAuto) {
...@@ -584,7 +584,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -584,7 +584,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//调完ekp接口才会是1 //调完ekp接口才会是1
settle.setIsEstimatePush(CommonConstants.ZERO_INT); settle.setIsEstimatePush(CommonConstants.ZERO_INT);
settle.setId(RandomStringUtils.randomNumeric(19)); settle.setId(RandomStringUtils.randomNumeric(19));
settleList.add(settle); tInsuranceSettleService.save(settle);
detail.setDefaultSettleId(settle.getId()); detail.setDefaultSettleId(settle.getId());
}else { }else {
detail.setEstimatePremium(BigDecimal.ZERO); detail.setEstimatePremium(BigDecimal.ZERO);
...@@ -694,10 +694,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -694,10 +694,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
// 同步操作档案的 商险状态为:2正常(0无2正常3失效4处理中) // 同步操作档案的 商险状态为:2正常(0无2正常3失效4处理中)
this.doFailInfo(detailList, sourceIdCardList, replaceIdList, CommonConstants.FOUR_STRING); this.doFailInfo(detailList, sourceIdCardList, replaceIdList, CommonConstants.FOUR_STRING);
//插入结算数据 //插入结算数据
if (!settleList.isEmpty()) { /*if (!settleList.isEmpty()) {
tInsuranceSettleService.saveBatch(settleList); tInsuranceSettleService.saveBatch(settleList);
settleList.clear(); settleList.clear();
} }*/
} }
//操作记录 //操作记录
if (!isAuto) { if (!isAuto) {
......
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