Commit 4791f720 authored by fangxinjiang's avatar fangxinjiang

合同续签待办-fxj

parent 944931dc
......@@ -630,7 +630,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
if (CommonConstants.TWENTY_STRING.equals(preVo.getContractType())){
//处理劳务协议
//处理劳务协议: 先看上一份合同是否为劳务协议,如果是取值上一份合同的劳务协议结束日期
preVo.setDispatchPeriodStart(DateUtil.addDayByDate(contract.getContractEnd(),1));
if (Common.isNotNull(preVo.getDispatchPeriodYear()) && Common.isNotNull(preVo.getDispatchPeriodMonth())){
vo = new TEmployeeContractDateVo();
......@@ -1378,13 +1378,24 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
if (Common.isEmpty(contractIds)) {
return R.ok("前一日撤销记录中未找到有效的合同ID");
}
List<TEmployeeContractInfo> contracts = contractInfoMapper.selectList(Wrappers.<TEmployeeContractInfo>query()
.lambda()
.in(TEmployeeContractInfo::getId, contractIds));
List<String> preNewIds = null;
if (!Common.isEmpty(contracts)){
preNewIds = contracts.stream()
.map(TEmployeeContractInfo::getPreNewId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
}
if (Common.isEmpty(preNewIds)) {
return R.ok("前一日撤销记录中未找到有效的PreNewID");
}
// 根据合同ID查询对应的合同预签订记录
List<TEmployeeContractPreNew> revokedContracts = baseMapper.selectList(Wrappers.<TEmployeeContractPreNew>query()
.lambda()
.in(TEmployeeContractPreNew::getContractId, contractIds)
.in(TEmployeeContractPreNew::getId, preNewIds)
.eq(TEmployeeContractPreNew::getProcessStatus, CommonConstants.ELEVEN_STRING) // 撤销签署-系统自动撤销
.eq(TEmployeeContractPreNew::getSignType, CommonConstants.ZERO_STRING) // 线下签
.eq(TEmployeeContractPreNew::getChangeTypeReason, "超时未签署自行变更为线下签")
);
......
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