Commit 07e75bdb authored by hongguangwu's avatar hongguangwu

30号版本:档案合同、商险、薪资状态;缴费库反馈列;合同提交的直接审核优化等

parent 37f71ca5
...@@ -1144,6 +1144,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1144,6 +1144,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<InsuranceListVO> errorList = new ArrayList<>(); List<InsuranceListVO> errorList = new ArrayList<>();
//后端处理的数据 //后端处理的数据
List<TInsuranceDetail> successList = new ArrayList<>(); List<TInsuranceDetail> successList = new ArrayList<>();
//被替换人的档案要处理状态
List<String> sourceIdCardList = new ArrayList<>();
// 被替换的id
List<String> replaceIdList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(detailList)){ if (CollectionUtils.isNotEmpty(detailList)){
for (TInsuranceDetail detail : detailList) { for (TInsuranceDetail detail : detailList) {
if (detail.getBuyHandleStatus() == CommonConstants.FOUR_INT if (detail.getBuyHandleStatus() == CommonConstants.FOUR_INT
...@@ -1196,6 +1200,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1196,6 +1200,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail.setUpdateTime(LocalDateTime.now()); detail.setUpdateTime(LocalDateTime.now());
detail.setBackRemark(remarkMap.get(detail.getId())); detail.setBackRemark(remarkMap.get(detail.getId()));
successList.add(detail); successList.add(detail);
sourceIdCardList.add(detail.getEmpIdcardNo());
replaceIdList.add(detail.getId());
} }
} }
} }
...@@ -1286,6 +1292,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1286,6 +1292,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
//更新状态 //更新状态
this.saveOrUpdateBatch(successList); this.saveOrUpdateBatch(successList);
// 处理档案状态
if (CollectionUtils.isNotEmpty(successList)) {
this.doFailInfo(successList, sourceIdCardList, replaceIdList, CommonConstants.FOUR_STRING);
}
} }
//操作记录 //操作记录
addOperate(operateList,user,InsurancesConstants.ROLLBACK); addOperate(operateList,user,InsurancesConstants.ROLLBACK);
...@@ -1323,7 +1334,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1323,7 +1334,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
handleParam.setRemark(e.getRemark()); handleParam.setRemark(e.getRemark());
list.add(handleParam); list.add(handleParam);
}); });
// TODO-关联档案1 // 关联档案1
this.successfulInsurance(user,list); this.successfulInsurance(user,list);
} }
...@@ -1336,7 +1347,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1336,7 +1347,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
handleParam.setRemark(e.getRemark()); handleParam.setRemark(e.getRemark());
list.add(handleParam); list.add(handleParam);
}); });
// TODO-关联档案2 // 关联档案2
this.rollBackInsurance(user,list); this.rollBackInsurance(user,list);
} }
} }
......
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