From f625ae7edfa835f5c72967a8bcc1584df8ab61ec Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期四, 03 四月 2025 12:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 f3e33ba..f41d87b 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
@@ -295,10 +295,11 @@
// 添加验收记录
dto.setCheckPerson(tokenService.getLoginUser().getUser().getNickName());
checkAcceptRecordService.updateById(dto);
- TContract contract = contractService.getById(dto.getContractId());
+ TCheckAcceptRecord checkAcceptRecord = checkAcceptRecordService.getById(dto.getId());
+ 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