From 1d84cd142b68c11de372245f511cce1ae08852d5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 06 三月 2025 19:15:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 73a6b1f..e34febd 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
@@ -290,7 +290,7 @@
rentBill.setEndTime(rentBill.getStartTime().plusMonths(contract.getPayType().equals("1") ? 1 : contract.getPayType().equals("2") ? 3 : 12).with(TemporalAdjusters.lastDayOfMonth()));
}
} else {
- rentBill.setEndTime(contract.getEndTime());
+ rentBill.setEndTime(rentBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()));
}
if (tContractRentType != null && rentBill.getEndTime().isAfter(tContractRentType.getChangeTime())) {
long moneyDays = 0;
@@ -651,11 +651,10 @@
}
case CATEGORY3: {
// 合同提前终止审批
- int submitStatus = status == 0 ? 4 : (status == 1 ? 6 : 5);
+ int submitStatus = status == 0 ? 4 : (status == 1 ? 7 : 5);
contractService.updateContractAuditStatus(processParameter.getString("projectId"), submitStatus);
// 生成验收记录
TContract contract = contractService.getById(processParameter.getString("projectId"));
- contract.setStatus("7");
TCheckAcceptRecord tCheckAcceptRecord = new TCheckAcceptRecord();
tCheckAcceptRecord.setContractId(contract.getId());
tCheckAcceptRecord.setHouseId(contract.getHouseId());
@@ -667,7 +666,6 @@
int size = checkAcceptRecordMapper.selectList(new LambdaQueryWrapper<TCheckAcceptRecord>()
.likeRight(TCheckAcceptRecord::getAcceptanceTime, LocalDate.now())).size();
tCheckAcceptRecord.setCode(replace.substring(2) + String.format("%03d", size + 1));
-
checkAcceptRecordMapper.insert(tCheckAcceptRecord);
// 将所有未缴费账单设置未已失效
--
Gitblit v1.7.1