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 | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 5c95dc4..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
@@ -317,7 +317,6 @@
@Log(title = "合同管理-确认结算", businessType = BusinessType.UPDATE)
@ApiOperation(value = "确认结算")
@PostMapping(value = "/confirmSettlement")
-
public R<Boolean> confirmSettlement(String id) {
TContract contract = contractService.getById(id);
contract.setStatus("8");
@@ -330,7 +329,12 @@
for (TBill tBill : tBills) {
tBill.setPayFeesStatus("5");
}
- billService.updateBatchById(tBills); return R.ok();
+ billService.updateBatchById(tBills);
+ // 将房屋改成待出租
+ THouse house = houseService.getById(contract.getHouseId());
+ house.setLeaseStatus("1");
+ houseService.updateById(house);
+ return R.ok();
}
@ApiOperation(value = "终止合同剩余未缴费账单列表")
@PostMapping(value = "/contractBillList")
@@ -375,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()
@@ -403,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())
@@ -466,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