From c48ecad4633a6624fec92e42ecd9eeca488a636c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 06 三月 2025 13:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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 71245b0..41c16d0 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
@@ -116,7 +116,7 @@
new ImmutableMap.Builder<String, Long>().
put("id", flwTask.getId())
.build();
- QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name+flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT,new Date(new Date().getTime()+3*60*1000L), maps);
+ QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name+flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT,new Date(new Date().getTime()+48*60*60*1000L), maps);
//对比发起人和节点审批人
@@ -167,7 +167,7 @@
new ImmutableMap.Builder<String, Long>().
put("id", flwTask.getId())
.build();
- QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name+flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT,new Date(new Date().getTime()+3*60*1000L), maps);
+ QuartzManager.addJob(StateProcessJob.class, (StateProcessJob.name+flwTask.getId()).toUpperCase(), TimeJobType.AUTO_AUDIT,new Date(new Date().getTime()+48*60*60*1000L), maps);
//对比发起人和节点审批人
@@ -281,10 +281,25 @@
rentBill.setBillType("1");
rentBill.setStartTime(contract.getStartPayTime());
+ if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
+ rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
+ }else{
+ rentBill.setEndTime(contract.getEndTime());
+ }
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())){
+ if (tContractRentType!=null && rentBill.getEndTime().isAfter(tContractRentType.getChangeTime()) ){
+ long moneyDays = 0;
+ switch (contract.getPayType()){
+ case "1":
+ break;
+ case "2":
+ break;
+ case "3":
+ break;
+
+ }
// 计算租金变动的天数
- long moneyDays = ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), contract.getStartPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12))+1L;
+ moneyDays = Math.abs(ChronoUnit.DAYS.between(tContractRentType.getChangeTime(), contract.getStartPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12))+1L);
contract.setChangeTime(LocalDateTime.now());
// 递增递减的租金
BigDecimal contractRentTypeMoney = new BigDecimal("0");
@@ -324,11 +339,7 @@
.multiply(new BigDecimal(originalDays));
rentBill.setPayableFeesMoney(contractRentTypeMoney.add(originalMoney));
rentBill.setOutstandingMoney(rentBill.getPayableFeesMoney());
- if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
- rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
- }else{
- rentBill.setEndTime(contract.getEndTime());
- }
+
}else{
if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
rentBill.setEndTime(contract.getEndTime());
@@ -745,6 +756,7 @@
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());
@@ -758,10 +770,11 @@
tCheckAcceptRecord.setCode(replace.substring(2)+String.format("%03d", size+1));
+
checkAcceptRecordMapper.insert(tCheckAcceptRecord);
// 将所有未缴费账单设置未已失效
List<TBill> tBills = billService.list(new LambdaQueryWrapper<TBill>()
- .in(TBill::getPayFeesStatus, Arrays.asList("1,4"))
+ .in(TBill::getPayFeesStatus, Arrays.asList("1,2,4"))
.eq(TBill::getContractId, contract.getId()));
for (TBill tBill : tBills) {
tBill.setPayFeesStatus("5");
--
Gitblit v1.7.1