From 70d2ac8e21669adb1d6ae560ac09bbfe2645de35 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:52:31 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 007aa13..bc2be5a 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
@@ -379,7 +379,7 @@
if (StringUtils.isNotEmpty(contractId)) {
firstBill = billService.lambdaQuery()
.eq(TBill::getContractId, contractId)
- .orderByDesc(TBill::getStartTime)
+ .orderByAsc(TBill::getStartTime)
.last("limit 1")
.one();
tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery()
@@ -407,6 +407,7 @@
fill(templateParam, "bankNumber", tenant.getBankNumber());
fill(templateParam, "bankName", tenant.getBankName());
fill(templateParam, "partyTwoName", tenant.getLessee());
+ fill(templateParam, "email", tenant.getEmail());
// 企业、政府机构、国有企业
if (Objects.nonNull(tenant.getTenantType())
@@ -470,7 +471,13 @@
// 首期租金处理
if (firstBill != null) {
- fill(templateParam, "firstRent", "￥" + firstBill.getPayableFeesMoney() + "元");
+ double firstRent = (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, "firstRent", "￥" + firstRent + "元");
} else {
fill(templateParam, "firstRent", "");
}
--
Gitblit v1.7.1