From 39041d8f27cdbaac8eb48dbd156ecc37f8e25c10 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期五, 04 四月 2025 00:52:48 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 20 ++++++++++++++++++--
1 files changed, 18 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 5c95dc4..3a887ff 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")
@@ -366,6 +370,18 @@
return R.ok(res);
}
+ // 计算两个日期相差天数的方法实现：
+ public static long calculateDaysBetween(LocalDateTime start, LocalDateTime end) {
+ return ChronoUnit.DAYS.between(start, end);
+ }
+
+ public static void main(String[] args) {
+ LocalDateTime start = LocalDateTime.of(2024, 1, 1, 0, 0);
+ LocalDateTime end = LocalDateTime.of(2024, 1, 5, 12, 0);
+ long days = calculateDaysBetween(start, end); // 返回4天（不满一天不计）
+
+ }
+
private String generateContract(TContract contract) {
String templateFileName = "1_yzj_租赁合同_个人.docx";
String contractId = contract.getId();
--
Gitblit v1.7.1