Commit b9871c39 authored by fangxinjiang's avatar fangxinjiang

优化-fxj

parent 98b47e62
...@@ -738,6 +738,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -738,6 +738,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
.eq(TEmployeeContractPre::getEmpIdcard, vo.getEmpIdcard()) .eq(TEmployeeContractPre::getEmpIdcard, vo.getEmpIdcard())
.eq(TEmployeeContractPre::getDeptNo, vo.getDeptNo()) .eq(TEmployeeContractPre::getDeptNo, vo.getDeptNo())
.ne(TEmployeeContractPre::getProcessStatus, CommonConstants.TEN_STRING) .ne(TEmployeeContractPre::getProcessStatus, CommonConstants.TEN_STRING)
.ne(TEmployeeContractPre::getIsRefuse, CommonConstants.ONE_STRING)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(contractPre)) { if (Common.isNotNull(contractPre)) {
//如果是已完结判断合同申请数据在不在用 //如果是已完结判断合同申请数据在不在用
......
...@@ -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);
......
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