Commit 01a7664c authored by fangxinjiang's avatar fangxinjiang

流程中合同代码回退-fxj

parent 472bae2a
...@@ -103,8 +103,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -103,8 +103,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
private final TGzOfferInfoMapper gzOfferInfoMapper; private final TGzOfferInfoMapper gzOfferInfoMapper;
private final TContractPreDetailService tContractPreDetailService;
@Autowired @Autowired
@Lazy @Lazy
private ScheduleService scheduleService; private ScheduleService scheduleService;
...@@ -326,9 +324,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -326,9 +324,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
sb.append("/合同"); sb.append("/合同");
} }
} }
//删除合同流程中信息
tContractPreDetailService.remove(Wrappers.<TContractPreDetail>lambdaQuery()
.eq(TContractPreDetail::getRegisterId, updatePre.getId()));
} catch (Exception e) { } catch (Exception e) {
log.error("调用csp服务更新数据异常", e); log.error("调用csp服务更新数据异常", e);
} }
...@@ -941,33 +936,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -941,33 +936,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
employeeRegistrationPre.setEmployeeContractPre(null); employeeRegistrationPre.setEmployeeContractPre(null);
} }
} }
//1.9.18合同流程中信息集合处理逻辑
if (employeeRegistrationPre.getServerItem().contains("合同")) {
if (Common.isNotNull(employeeRegistrationPre.getExitContractInfoList())
&& !employeeRegistrationPre.getExitContractInfoList().isEmpty()) {
// 设置registerId
for (TContractPreDetailVo contractDetail : employeeRegistrationPre.getExitContractInfoList()) {
contractDetail.setRegisterId(id);
}
// 删除旧的合同流程中信息
tContractPreDetailService.remove(Wrappers.<TContractPreDetail>lambdaQuery()
.eq(TContractPreDetail::getRegisterId, id));
// 批量新增合同流程中信息
List<TContractPreDetail> detailList = new ArrayList<>();
for (TContractPreDetailVo vo : employeeRegistrationPre.getExitContractInfoList()) {
TContractPreDetail detail = new TContractPreDetail();
BeanUtils.copyProperties(vo, detail);
detail.setId(null);
detailList.add(detail);
}
tContractPreDetailService.saveBatch(detailList);
} else {
// 如果服务事项包含合同但exitContractInfoList为空,删除旧的合同流程中信息
tContractPreDetailService.remove(Wrappers.<TContractPreDetail>lambdaQuery()
.eq(TContractPreDetail::getRegisterId, id));
}
}
} }
//1.9.16社保自动化校验逻辑 //1.9.16社保自动化校验逻辑
...@@ -1907,20 +1875,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -1907,20 +1875,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
pre.setDispatchInfoFundPreVo(fundsdr.getData().getDispatchInfoPreFundVo()); pre.setDispatchInfoFundPreVo(fundsdr.getData().getDispatchInfoPreFundVo());
} }
} }
// 查询已购买合同明细
List<TContractPreDetail> exitContractInfoList = tContractPreDetailService.list(Wrappers.<TContractPreDetail>query().lambda()
.eq(TContractPreDetail::getRegisterId, id));
if (Common.isNotNull(exitContractInfoList) && !exitContractInfoList.isEmpty()) {
List<TContractPreDetailVo> exitContractInfoListVo = exitContractInfoList.stream()
.map(detail -> {
TContractPreDetailVo vo = new TContractPreDetailVo();
BeanUtils.copyProperties(detail, vo);
return vo;
})
.collect(Collectors.toList());
pre.setExitContractInfoList(exitContractInfoListVo);
}
} }
return pre; return pre;
} }
......
...@@ -917,16 +917,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -917,16 +917,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo.getEmployeeContractPreVos().setRegisterId(domainR.getData()); preVo.getEmployeeContractPreVos().setRegisterId(domainR.getData());
archivesDaprUtil.saveContractPreInfo(preVo.getEmployeeContractPreVos()); archivesDaprUtil.saveContractPreInfo(preVo.getEmployeeContractPreVos());
} }
// 处理合同流程中信息集合
if (preVo.getServerItem().contains("合同")
&& null != preVo.getExitContractInfoList()
&& !preVo.getExitContractInfoList().isEmpty()) {
// 设置registerId关联
preVo.getExitContractInfoList().forEach(contractPreDetailVo ->
contractPreDetailVo.setRegisterId(domainR.getData()));
// 保存合同流程中信息集合
archivesDaprUtil.saveContractPreDetailList(preVo);
}
//服务类型包含社保购买时 //服务类型包含社保购买时
if (preVo.getServerItem().contains("社保") && (null != preVo.getExitSocialInfoList() if (preVo.getServerItem().contains("社保") && (null != preVo.getExitSocialInfoList()
|| null != preVo.getDispatchInfoPreVo())) { || null != preVo.getDispatchInfoPreVo())) {
...@@ -1721,15 +1711,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1721,15 +1711,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
employeeContractPreVo.setRegisterId(domainR.getData()); employeeContractPreVo.setRegisterId(domainR.getData());
archivesDaprUtil.saveContractPreInfo(employeeContractPreVo); archivesDaprUtil.saveContractPreInfo(employeeContractPreVo);
} }
// 服务类型包含合同且存在合同流程中信息集合时
if (preVo.getServerItem().contains("合同")
&& null != preVo.getExitContractInfoList()
&& !preVo.getExitContractInfoList().isEmpty()) {
preVo.getExitContractInfoList().forEach(contractPreDetailVo ->
contractPreDetailVo.setRegisterId(domainR.getData()));
// 保存合同流程中信息集合
archivesDaprUtil.saveContractPreDetailList(preVo);
}
//服务类型包含社保购买时 //服务类型包含社保购买时
if (preVo.getServerItem().contains("社保") && (null != preVo.getExitSocialInfoList() if (preVo.getServerItem().contains("社保") && (null != preVo.getExitSocialInfoList()
|| null != preVo.getDispatchInfoPreVo())) { || null != preVo.getDispatchInfoPreVo())) {
......
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