From 32418ccf94327d5446f4e87337cb7ff7bc8c3131 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 01:49:12 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 14 +++++---------
1 files changed, 5 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..2456e4c 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
@@ -14,6 +14,7 @@
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DisabledEnum;
import com.ruoyi.common.enums.ProcessCategoryEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
@@ -392,6 +393,7 @@
firstBill = billService.lambdaQuery()
.eq(TBill::getContractId, contractId)
.orderByAsc(TBill::getStartTime)
+ .ne(TBill::getManualAddition, DisabledEnum.YES.getCode())
.last("limit 1")
.one();
tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery()
@@ -489,19 +491,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