From 2eb2ba547d0c0087b4619033db9f0d2a0cff0b06 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 10 四月 2025 11:31:33 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
index f3d7f8b..9abc49d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
@@ -31,6 +31,7 @@
import com.ruoyi.system.service.TContractService;
import com.ruoyi.system.vo.BillVO;
import com.ruoyi.system.vo.CheckAcceptRecordVO;
+import com.ruoyi.system.vo.ScreenRentIncomeTrendVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -124,6 +125,7 @@
public void terminateContract(TerminateContractDTO dto) {
TContract contract = this.baseMapper.selectById(dto.getId());
contract.setTerminateRemark(dto.getTerminateRemark());
+ contract.setTerminateTime(dto.getTerminateTime());
this.baseMapper.updateById(contract);
// 进入合同提前终止审批流程
ProcessStartBO processStartBO = new ProcessStartBO();
@@ -221,4 +223,5 @@
pageInfo = this.baseMapper.page(pageInfo,query);
return pageInfo;
}
+
}
--
Gitblit v1.7.1