Commit 34144adc authored by hongguangwu's avatar hongguangwu

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

parents 68cb0a91 8f9ad1ea
...@@ -949,9 +949,9 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -949,9 +949,9 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
List<TEmployeeContractPre> revokedContracts = baseMapper.selectList(Wrappers.<TEmployeeContractPre>query() List<TEmployeeContractPre> revokedContracts = baseMapper.selectList(Wrappers.<TEmployeeContractPre>query()
.lambda() .lambda()
.in(TEmployeeContractPre::getContractId, contractIds) .in(TEmployeeContractPre::getContractId, contractIds)
.eq(TEmployeeContractPre::getProcessStatus, CommonConstants.ONE_STRING) // 待发起 .eq(TEmployeeContractPre::getProcessStatus, CommonConstants.ELEVEN_STRING) // 撤销签署-系统自动撤销
.eq(TEmployeeContractPre::getSignType, CommonConstants.ONE_STRING) // 线下签 .eq(TEmployeeContractPre::getSignType, CommonConstants.ONE_STRING) // 线下签
.eq(TEmployeeContractPre::getRevokeReason, "超时未签署自行变更为线下签") .eq(TEmployeeContractPre::getChangeTypeReason, "超时未签署自行变更为线下签")
); );
if (Common.isEmpty(revokedContracts)) { if (Common.isEmpty(revokedContracts)) {
......
...@@ -130,7 +130,9 @@ public class DoFascTask { ...@@ -130,7 +130,9 @@ public class DoFascTask {
// 加日志 // 加日志
this.saveAuditLogFail(pre, "撤销签署成功", terminationNote); this.saveAuditLogFail(pre, "撤销签署成功", terminationNote);
} }
pre.setProcessStatus(CommonConstants.TEN_STRING); if (!CommonConstants.ELEVEN_STRING.equals(pre.getProcessStatus())) {
pre.setProcessStatus(CommonConstants.TEN_STRING);
}
pre.setSignFlag(CommonConstants.ZERO_STRING); pre.setSignFlag(CommonConstants.ZERO_STRING);
pre.setRevokeReason(terminationNote); pre.setRevokeReason(terminationNote);
tEmployeeContractPreService.updateById(pre); tEmployeeContractPreService.updateById(pre);
...@@ -202,7 +204,9 @@ public class DoFascTask { ...@@ -202,7 +204,9 @@ public class DoFascTask {
// 加日志 // 加日志
this.saveAuditLogFail(preHistory, "撤销签署成功", terminationNote); this.saveAuditLogFail(preHistory, "撤销签署成功", terminationNote);
} }
preHistory.setProcessStatus(CommonConstants.TEN_STRING); if (!CommonConstants.ELEVEN_STRING.equals(preHistory.getProcessStatus())) {
preHistory.setProcessStatus(CommonConstants.TEN_STRING);
}
preHistory.setSignFlag(CommonConstants.ZERO_STRING); preHistory.setSignFlag(CommonConstants.ZERO_STRING);
preHistory.setRevokeReason(terminationNote); preHistory.setRevokeReason(terminationNote);
tEmployeeContractPreHistoryService.updateById(preHistory); tEmployeeContractPreHistoryService.updateById(preHistory);
......
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