From 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index 12694e0..a8bcb1d 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -202,6 +202,7 @@
myToDoVO.setStartTime(DateUtils.localDateTimeToStringYear(contract.getStartTime()));
myToDoVO.setPropertyRightPerson(tHouse.getPropertyRightPerson());
myToDoVO.setPhone(tHouse.getPhone());
+ myToDoVO.setRentalReturnStatus(tHouse.getRentalReturnStatus() == null ? "1" : tHouse.getRentalReturnStatus());
List<TBill> billList = bills.stream().filter(e -> e.getContractId().equals(contract.getId())).collect(Collectors.toList());
List<PayListVO> payList = new ArrayList<>();
for (TBill tBill : billList) {
@@ -299,7 +300,7 @@
TContract contract = contractService.getById(checkAcceptRecord.getContractId());
// 添加账单
TBill tBill = new TBill();
- tBill.setContractId(dto.getContractId());
+ tBill.setContractId(checkAcceptRecord.getContractId());
tBill.setContractNumber(contract.getContractNumber());
tBill.setPayableFeesMoney(dto.getCheckMoney());
tBill.setPayableFeesTime(LocalDate.now());
--
Gitblit v1.7.1