From cd3d553f88fb74f1b15eca9fd50b4318956fb01d Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期二, 15 四月 2025 10:51:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRentalReturnRecordServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRentalReturnRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRentalReturnRecordServiceImpl.java
index c7f07fa..138b8dd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRentalReturnRecordServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRentalReturnRecordServiceImpl.java
@@ -92,11 +92,12 @@
if (returnAuditQuery.getAuditResult() == 2){
TContract contract = contractService.getById(record.getContractId());
contract.setTerminateRemark(returnAuditQuery.getAuditOpinion());
+ contract.setTerminateTime(record.getCreateTime());
contractService.updateById(contract);
// 进入合同提前终止审批流程
ProcessStartBO processStartBO = new ProcessStartBO();
processStartBO.setCategory(ProcessCategoryEnum.CATEGORY3.getValue().toString());
- processStartBO.setModuleName("房屋退租合同终止审批");
+ processStartBO.setModuleName("合同提前终止审批");
processStartBO.setName(contract.getContractName());
processStartBO.setRemark("");
Map<String, Object> variable = new HashMap<>();
--
Gitblit v1.7.1