From 82213006f518b03fef37f7af73f03cbcf73c4b8c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 三月 2025 15:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml | 7 +++++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java | 10 +++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
index 7643d30..1c0db15 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
@@ -394,7 +394,7 @@
if (changeTime.isBefore(tBill.getEndTime()) && changeTime.isAfter(tBill.getStartTime())) {
contract.setChangeTime(changeTime);
// 租金递增递减的时长 天
- long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
+ long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()));
// 递增递减的租金
BigDecimal contractRentTypeMoney = new BigDecimal("0");
// 不递增递减的租金
@@ -445,7 +445,7 @@
if (tContractRentType.getChangeTime().isBefore(tBill.getEndTime()) && tContractRentType.getChangeTime().isAfter(tBill.getStartTime())) {
contract.setChangeTime(tContractRentType.getChangeTime());
// 租金递增递减的时长 天
- long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
+ long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()));
// 递增递减的租金
BigDecimal contractRentTypeMoney = new BigDecimal("0");
// 不递增递减的租金
@@ -522,6 +522,7 @@
tBill.setBillType("1");
tBill.setStartTime(beforeBill.getEndTime().plusDays(1));
tBill.setEndTime(contract.getEndTime());
+ tBill.setContractNumber(contract.getContractNumber());
if (contract.getIsIncreasing()) {
if (tContractRentType != null) {
// 如果变过 并且时间在递增递减时间段内
@@ -532,7 +533,7 @@
if (changeTime.isBefore(tBill.getEndTime()) && changeTime.isAfter(tBill.getStartTime())) {
contract.setChangeTime(changeTime);
// 租金递增递减的时长 天
- long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
+ long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()));
// 递增递减的租金
BigDecimal contractRentTypeMoney = new BigDecimal("0");
// 不递增递减的租金
@@ -583,7 +584,7 @@
if (tContractRentType.getChangeTime().isBefore(tBill.getEndTime()) && tContractRentType.getChangeTime().isAfter(tBill.getStartTime())) {
contract.setChangeTime(tContractRentType.getChangeTime());
// 租金递增递减的时长 天
- long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), beforeBill.getEndTime()));
+ long moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), tBill.getEndTime()));
// 递增递减的租金
BigDecimal contractRentTypeMoney = new BigDecimal("0");
// 不递增递减的租金
@@ -643,7 +644,6 @@
long finalDays = ChronoUnit.DAYS.between(beforeBill.getEndTime(), contract.getEndTime());
tBill.setPayableFeesMoney(contract.getChangeRent().divide(new BigDecimal("30"),2,BigDecimal.ROUND_DOWN).multiply(new BigDecimal(finalDays)));
tBill.setOutstandingMoney(tBill.getPayableFeesMoney());
- tBill.setContractNumber(contract.getContractNumber());
}
if (tBill.getEndTime().getDayOfMonth()>=15){
tBill.setPayableFeesTime(tBill.getStartTime().withDayOfMonth(15).toLocalDate());
diff --git a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
index 6c81ca8..f0f1693 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
@@ -90,8 +90,11 @@
left join t_house h on t.house_id = h.id
<where>
- <if test="query.status != null and query.status != ''">
- AND t.status = #{query.status}
+ <if test="query.status != null and query.status != '' and query.status == 1">
+ AND t.status = 0
+ </if>
+ <if test="query.status != null and query.status != '' and query.status == 2">
+ AND t.status = 1
</if>
<if test="query.houseNameOrAddress != null and query.houseNameOrAddress != ''">
AND (h.house_name LIKE concat('%', #{query.houseNameOrAddress}, '%') or h.house_address LIKE concat('%', #{query.houseNameOrAddress}, '%'))
--
Gitblit v1.7.1