From 8a895d11df584c71fd6d5a48f30aaab5afea74f6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 01:14:11 +0800
Subject: [PATCH] bug修改

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index 196e3d3..9eb6592 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -489,19 +489,13 @@
                     ? contract.getMonthRent().multiply(new BigDecimal("3"))
                     : contract.getMonthRent().multiply(new BigDecimal("12")))
                     .setScale(2, RoundingMode.DOWN).doubleValue();
-            fill(templateParam, "firstRent", "¥" + firstRent + "元");
+            fill(templateParam, "firstRent", "¥" + firstBill.getPayableFeesMoney() + "元");
+            // 其他财务字段
+            fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(firstBill.getPayableFeesMoney().doubleValue()));
         } else {
             fill(templateParam, "firstRent", "");
         }
 
-        // 其他财务字段
-        fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(
-                (contract.getPayType().equals("1")
-                        ? contract.getMonthRent()
-                        : contract.getPayType().equals("2")
-                        ? contract.getMonthRent().multiply(new BigDecimal("3"))
-                        : contract.getMonthRent().multiply(new BigDecimal("12")))
-                        .setScale(2, RoundingMode.DOWN).doubleValue()));
 
         fill(templateParam, "firstRentString",
                 "人民币"+NumberToChineseUtils.numberToChinese(

--
Gitblit v1.7.1