From 2a83dac503b6a21015ce945a179d98e2ab9ef371 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 15:51:08 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 18 +++++++++++-------
ruoyi-system/src/main/java/com/ruoyi/system/dto/TContractDTO.java | 4 +---
2 files changed, 12 insertions(+), 10 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 6987379..ab28ad1 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
@@ -553,13 +553,17 @@
private BigDecimal extracted(TContract contract,TContractDTO dto) {
TContractRentType tContractRentType = null;
if (contract.getIsIncreasing()){
- tContractRentType = new TContractRentType();
- tContractRentType.setContractId(contract.getId());
- tContractRentType.setIncreasingDecreasing(dto.getIncreasingDecreasing());
- tContractRentType.setIncreasingDecreasingType(dto.getIncreasingDecreasingType());
- tContractRentType.setNumericalValue(dto.getNumericalValue());
- tContractRentType.setChangeTime(dto.getChangeTime());
- tContractRentType.setCycleTime(dto.getCycleTime());
+ tContractRentType = contractRentTypeService.lambdaQuery().eq(TContractRentType::getContractId, contract.getId())
+ .last("limit 1").one();
+ if (tContractRentType==null){
+ tContractRentType = new TContractRentType();
+ tContractRentType.setContractId(contract.getId());
+ tContractRentType.setIncreasingDecreasing(dto.getIncreasingDecreasing());
+ tContractRentType.setIncreasingDecreasingType(dto.getIncreasingDecreasingType());
+ tContractRentType.setNumericalValue(dto.getNumericalValue());
+ tContractRentType.setChangeTime(dto.getChangeTime());
+ tContractRentType.setCycleTime(dto.getCycleTime());
+ }
}
// 生成第一笔账单
// 第一次应缴费日期
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TContractDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TContractDTO.java
index 11206fd..6c9fc20 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TContractDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TContractDTO.java
@@ -21,9 +21,7 @@
@ApiModelProperty(value = "数值")
private BigDecimal numericalValue;
- @ApiModelProperty(value = "递增或递减时点")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime changeTime;
+
@ApiModelProperty(value = "周期 单位年")
private Integer cycleTime;
}
--
Gitblit v1.7.1