Commit 96750f36 authored by hongguangwu's avatar hongguangwu

MVP1.7.16-复制

parent f1d22b17
...@@ -431,14 +431,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -431,14 +431,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
R<String> result = null; R<String> result = null;
TEmployeeContractPre contract = baseMapper.selectById(contractPre.getId()); TEmployeeContractPre contract = baseMapper.selectById(contractPre.getId());
// 复制一份快照 // 复制一份快照
if (contract != null && Common.isNotNull(contract.getId())) {
TEmployeeContractPreHistory contractHistory = new TEmployeeContractPreHistory(); TEmployeeContractPreHistory contractHistory = new TEmployeeContractPreHistory();
if (contract != null && Common.isNotNull(contract.getId())) {
BeanUtil.copyProperties(contract, contractHistory); BeanUtil.copyProperties(contract, contractHistory);
contractHistory.setId(null); contractHistory.setId(null);
tEmployeeContractPreHistoryMapper.insert(contractHistory); tEmployeeContractPreHistoryMapper.insert(contractHistory);
} }
try { try {
result = fascService.submitContract(contractPre.getId()); result = fascService.submitContract(contractPre.getId() );
} catch (Exception e) { } catch (Exception e) {
// 更新合同: // 更新合同:
if (Common.isNotNull(contract.getContractId())) { if (Common.isNotNull(contract.getContractId())) {
...@@ -481,6 +481,10 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -481,6 +481,10 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
errorMessage.setData(contractVO); errorMessage.setData(contractVO);
errorMessageListAll.add(errorMessage); errorMessageListAll.add(errorMessage);
} else { } else {
if (Common.isNotNull(contractHistory.getId()) && Common.isNotNull(result.getData())) {
contractHistory.setRequestId(result.getData());
tEmployeeContractPreHistoryMapper.updateById(contractHistory);
}
if (Common.isNotNull(contract.getContractId())) { if (Common.isNotNull(contract.getContractId())) {
TEmployeeContractAudit audit = new TEmployeeContractAudit(); TEmployeeContractAudit audit = new TEmployeeContractAudit();
audit.setRootName("签署中"); audit.setRootName("签署中");
......
...@@ -37,6 +37,8 @@ public class DoFascTask { ...@@ -37,6 +37,8 @@ public class DoFascTask {
@Autowired @Autowired
private TEmployeeContractPreService tEmployeeContractPreService; private TEmployeeContractPreService tEmployeeContractPreService;
@Autowired @Autowired
private TEmployeeContractPreHistoryService tEmployeeContractPreHistoryService;
@Autowired
private TEmployeeContractInfoService tEmployeeContractInfoService; private TEmployeeContractInfoService tEmployeeContractInfoService;
@Autowired @Autowired
private TEmployeeContractAuditService tEmployeeContractAuditService; private TEmployeeContractAuditService tEmployeeContractAuditService;
...@@ -67,7 +69,7 @@ public class DoFascTask { ...@@ -67,7 +69,7 @@ public class DoFascTask {
TEmployeeContractPre pre = tEmployeeContractPreService.getOne(Wrappers.<TEmployeeContractPre>query().lambda() TEmployeeContractPre pre = tEmployeeContractPreService.getOne(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getRequestId, signTaskId).last(CommonConstants.LAST_ONE_SQL)); .eq(TEmployeeContractPre::getRequestId, signTaskId).last(CommonConstants.LAST_ONE_SQL));
YifuUser user = getNewYifuUser(); YifuUser user = getNewYifuUser();
if (pre != null && Common.isNotNull(pre.getProcessStatus()) && !pre.getProcessStatus().equals(CommonConstants.dingleDigitStrArray[9])) { if (pre != null) {
TEmployeeContractInfo contractInfo = null; TEmployeeContractInfo contractInfo = null;
if (Common.isNotNull(pre.getContractId())) { if (Common.isNotNull(pre.getContractId())) {
//如果存在合同申请审核数据,将状态更新成待提交 //如果存在合同申请审核数据,将状态更新成待提交
...@@ -75,6 +77,7 @@ public class DoFascTask { ...@@ -75,6 +77,7 @@ public class DoFascTask {
} }
if (contractInfo != null) { if (contractInfo != null) {
if (fddEvent.equals("sign-task-finished")) { if (fddEvent.equals("sign-task-finished")) {
if (Common.isNotNull(pre.getProcessStatus()) && !pre.getProcessStatus().equals(CommonConstants.dingleDigitStrArray[9])) {
// 1:签署任务完成事件 // 1:签署任务完成事件
// 8电子待归档 // 8电子待归档
pre.setProcessStatus(CommonConstants.dingleDigitStrArray[8]); pre.setProcessStatus(CommonConstants.dingleDigitStrArray[8]);
...@@ -106,6 +109,7 @@ public class DoFascTask { ...@@ -106,6 +109,7 @@ public class DoFascTask {
pushLog.setReturnData("签署任务完成事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent); pushLog.setReturnData("签署任务完成事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent);
}
} else if (fddEvent.equals("sign-task-canceled") || fddEvent.equals("sign-task-abolish")) { } else if (fddEvent.equals("sign-task-canceled") || fddEvent.equals("sign-task-abolish")) {
// 2:签署任务撤销事件 || 4:签署任务作废事件 // 2:签署任务撤销事件 || 4:签署任务作废事件
if (fddEvent.equals("sign-task-canceled")) { if (fddEvent.equals("sign-task-canceled")) {
...@@ -167,6 +171,65 @@ public class DoFascTask { ...@@ -167,6 +171,65 @@ public class DoFascTask {
pushLog.setReturnData("签署任务参与方签署失败事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent); pushLog.setReturnData("签署任务参与方签署失败事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent);
} }
} }
} else {
// 历史的日志
TEmployeeContractPreHistory preHistory = tEmployeeContractPreHistoryService.getOne(Wrappers.<TEmployeeContractPreHistory>query().lambda()
.eq(TEmployeeContractPreHistory::getRequestId, signTaskId).last(CommonConstants.LAST_ONE_SQL));
if (preHistory != null) {
TEmployeeContractInfo contractInfo = null;
if (Common.isNotNull(preHistory.getContractId())) {
//如果存在合同申请审核数据,将状态更新成待提交
contractInfo = tEmployeeContractInfoService.getById(preHistory.getContractId());
}
if (contractInfo != null) {
if (fddEvent.equals("sign-task-canceled") || fddEvent.equals("sign-task-abolish")) {
// 2:签署任务撤销事件 || 4:签署任务作废事件
if (fddEvent.equals("sign-task-canceled")) {
// 4:签署任务作废事件
pushLog.setReturnData("签署任务撤销事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent);
} else {
// 4:签署任务作废事件
pushLog.setReturnData("签署任务作废事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent);
}
//电子待归档、线下签待归档、已完结的不能撤销签署
if (Common.isNotNull(preHistory) && !CommonConstants.NINE_STRING.equals(preHistory.getProcessStatus()) &&
!CommonConstants.FOUR_STRING.equals(preHistory.getProcessStatus()) &&
!CommonConstants.EIGHT_STRING.equals(preHistory.getProcessStatus())) {
//如果不是待确认和待发起,需要记录操作记录
if (!CommonConstants.ZERO_STRING.equals(preHistory.getProcessStatus()) &&
!CommonConstants.ONE_STRING.equals(preHistory.getProcessStatus()) &&
Common.isNotNull(preHistory.getContractId())) {
// 加日志
this.saveAuditLogFail(preHistory, "撤销签署成功", terminationNote);
}
preHistory.setProcessStatus(CommonConstants.TEN_STRING);
preHistory.setSignFlag(CommonConstants.ZERO_STRING);
preHistory.setRevokeReason(terminationNote);
tEmployeeContractPreHistoryService.updateById(preHistory);
}
//如果存在合同申请审核数据,将状态更新成5撤销签署
contractInfo.setAuditStatus(CommonConstants.FIVE_INT);
contractInfo.setInUse(CommonConstants.ONE_STRING);
tEmployeeContractInfoService.updateById(contractInfo);
} else if (fddEvent.equals("sign-task-sign-failed")
|| fddEvent.equals("sign-task-sign-rejected")
|| fddEvent.equals("sign-task-ignore")
|| fddEvent.equals("sign-task-fill-rejected")) {
// 3:签署任务参与方签署失败事件
preHistory.setProcessStatus(CommonConstants.dingleDigitStrArray[7]);
preHistory.setRequestId("");
tEmployeeContractPreHistoryService.updateById(preHistory);
//如果存在合同申请审核数据,将状态更新成6签署失败
contractInfo.setAuditStatus(CommonConstants.SIX_INT);
contractInfo.setInUse(CommonConstants.ONE_STRING);
tEmployeeContractInfoService.updateById(contractInfo);
// 加日志
this.saveAuditLogFail(preHistory, "签署失败", terminationNote);
pushLog.setReturnData("签署任务参与方签署失败事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent);
}
}
}
} }
} }
tFascPushLogService.updateById(pushLog); tFascPushLogService.updateById(pushLog);
......
...@@ -397,7 +397,7 @@ public class FascUtil { ...@@ -397,7 +397,7 @@ public class FascUtil {
if (R.isSuccess(sendValue)) { if (R.isSuccess(sendValue)) {
// 电子签签署中 // 电子签签署中
this.doSuccessContract(contract, tEmployeeContractPreMapper, requestId); this.doSuccessContract(contract, tEmployeeContractPreMapper, requestId);
return R.ok(); return R.ok(requestId);
} else { } else {
msg = "第三步失败:提交任务失败:" + sendValue.getMsg(); msg = "第三步失败:提交任务失败:" + sendValue.getMsg();
} }
......
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