Commit 6e15ff7f authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents 0ca42287 fd15251c
......@@ -554,6 +554,21 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
} else {
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
this.judgeAuditStatus(tEmployeeContractInfo, user);
//撤销签署重新提交的话判断有没有合同待签订数据,有的话更新状态
TEmployeeContractPre contractPre = contractPreMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getContractId, tEmployeeContractInfo.getId())
.eq(TEmployeeContractPre::getProcessStatus, CommonConstants.TEN_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(contractPre)) {
if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.TWO_INT) {
contractPre.setProcessStatus(CommonConstants.FOUR_STRING);
} else if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.ONE_INT) {
contractPre.setProcessStatus(CommonConstants.TWO_STRING);
}
contractPre.setRevokeReason("");
contractPre.setSignFlag(CommonConstants.ONE_STRING);
contractPreMapper.updateById(contractPre);
}
baseMapper.updateById(tEmployeeContractInfo);
}
......
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