Commit a33e355b authored by fangxinjiang's avatar fangxinjiang

入职确认接收和修改合同优化-fxj

parent a211cf83
...@@ -326,6 +326,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -326,6 +326,9 @@ 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);
} }
...@@ -940,8 +943,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -940,8 +943,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
} }
//1.9.18合同流程中信息集合处理逻辑 //1.9.18合同流程中信息集合处理逻辑
if (employeeRegistrationPre.getServerItem().contains("合同") if (employeeRegistrationPre.getServerItem().contains("合同")) {
&& Common.isNotNull(employeeRegistrationPre.getExitContractInfoList()) if (Common.isNotNull(employeeRegistrationPre.getExitContractInfoList())
&& !employeeRegistrationPre.getExitContractInfoList().isEmpty()) { && !employeeRegistrationPre.getExitContractInfoList().isEmpty()) {
// 设置registerId // 设置registerId
for (TContractPreDetailVo contractDetail : employeeRegistrationPre.getExitContractInfoList()) { for (TContractPreDetailVo contractDetail : employeeRegistrationPre.getExitContractInfoList()) {
...@@ -959,6 +962,11 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -959,6 +962,11 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
detailList.add(detail); detailList.add(detail);
} }
tContractPreDetailService.saveBatch(detailList); tContractPreDetailService.saveBatch(detailList);
} else {
// 如果服务事项包含合同但exitContractInfoList为空,删除旧的合同流程中信息
tContractPreDetailService.remove(Wrappers.<TContractPreDetail>lambdaQuery()
.eq(TContractPreDetail::getRegisterId, id));
}
} }
} }
......
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