From c36156e7e89906701be638fe884565b5644666aa Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 13 二月 2025 14:35:14 +0800
Subject: [PATCH] 后台报修,房屋验收管理
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 a341a2a..ba5e047 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
@@ -83,12 +83,16 @@
List<TBill> bills = new ArrayList<>();
List<TContractRentType> contractRentTypes = contractRentTypeService.list();
- contract.setFirstPayTime(contract.getStartTime().plusDays(10));
- // 第一次应缴费日期
- LocalDateTime firstPayTime = contract.getStartTime().plusDays(10).withHour(0).withMinute(0).withSecond(0);
- TBill rentBill = new TBill();
- rentBill.setContractId(contract.getId());
- rentBill.setContractNumber(contract.getContractNumber());
+ contract.setFirstPayTime(contract.getStartTime().plusDays(10));
+ // 第一次应缴费日期
+ LocalDateTime firstPayTime = contract.getStartTime().plusDays(10).withHour(0).withMinute(0).withSecond(0);
+ LocalDate localDate = contract.getStartTime().plusDays(10).toLocalDate();
+ LocalDate now = LocalDate.now();
+ TBill rentBill = new TBill();
+ rentBill.setContractId(contract.getId());
+ rentBill.setContractNumber(contract.getContractNumber());
+ LocalDateTime startPayTime = contract.getStartPayTime();
+ LocalDateTime endTime1 = contract.getEndTime();
// // 计算两个时间相差多少天
// // 如果时间小于30天 需要计算每日租金
// if (days<30){
@@ -97,11 +101,11 @@
// rentBill.setPayableFeesMoney(contract.getPayType().equals("1")?contract.getMonthRent():
// contract.getPayType().equals("2")?contract.getMonthRent().multiply(new BigDecimal("3")):contract.getMonthRent().multiply(new BigDecimal("12")).setScale(2,BigDecimal.ROUND_DOWN));
// }
- rentBill.setPayableFeesTime(firstPayTime);
- rentBill.setPayFeesStatus("1");
- rentBill.setBillType("1");
- rentBill.setStartTime(contract.getStartPayTime());
- TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
+ rentBill.setPayableFeesTime(firstPayTime);
+ rentBill.setPayFeesStatus("1");
+ rentBill.setBillType("1");
+ rentBill.setStartTime(contract.getStartPayTime());
+ TContractRentType tContractRentType = contractRentTypes.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
if (tContractRentType!=null && contract.getStartPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(tContractRentType.getChangeTime())){
// 计算租金变动的天数
--
Gitblit v1.7.1