Commit c38e26a8 authored by hongguangwu's avatar hongguangwu

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

parents fe8795dc 57184972
......@@ -412,11 +412,12 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
} else {
// 合同创建成功,继续调用FascService的submitContract方法
R<String> result = null;
TEmployeeContractPre contract = baseMapper.selectById(contractPre.getId());
try {
result = fascService.submitContract(contractPre.getId());
} catch (Exception e) {
// 更新合同:
if (Common.isNotNull(contractPre.getContractId())) {
if (Common.isNotNull(contract.getContractId())) {
TEmployeeContractInfo empContract = contractInfoService.getById(contractPre.getContractId());
empContract.setDeleteFlag(CommonConstants.ONE_INT);
contractInfoService.updateById(empContract);
......@@ -435,8 +436,8 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
.set(TEmployeeContractPre::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now()));
this.update(updateWrapper);
// 更新合同:
if (Common.isNotNull(contractPre.getContractId())) {
TEmployeeContractInfo empContract = contractInfoService.getById(contractPre.getContractId());
if (Common.isNotNull(contract.getContractId())) {
TEmployeeContractInfo empContract = contractInfoService.getById(contract.getContractId());
empContract.setDeleteFlag(CommonConstants.ONE_INT);
contractInfoService.updateById(empContract);
}
......@@ -456,10 +457,10 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
errorMessage.setData(contractVO);
errorMessageListAll.add(errorMessage);
} else {
if (Common.isNotNull(contractPre.getContractId())) {
if (Common.isNotNull(contract.getContractId())) {
TEmployeeContractAudit audit = new TEmployeeContractAudit();
audit.setRootName("签署中");
audit.setLinkId(contractPre.getContractId());
audit.setLinkId(contract.getContractId());
audit.setLinkType(CommonConstants.ONE_INT);
audit.setCreateName("法大大电子签");
audit.setCreateBy("1");
......
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