From dbd15586146974c0c22c99f2321c77c2968b3806 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 16:31:07 +0800
Subject: [PATCH] 权限
---
ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml | 1 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 14 ++++++--------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 5 +++--
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 3 +++
4 files changed, 13 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 2152931..d6f9f12 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
@@ -184,15 +184,13 @@
if (contractRentType!=null){
BeanUtils.copyProperties(contractRentType,res);
}
- TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>()
- .eq(TContract::getHouseId,contract.getHouseId())
- .eq(TContract::getStatus, 4)
- .le(TContract::getStartTime, LocalDateTime.now())
- .ge(TContract::getEndTime, LocalDateTime.now()));
+// TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>()
+// .eq(TContract::getHouseId,contract.getHouseId())
+// .eq(TContract::getStatus, 4)
+// .le(TContract::getStartTime, LocalDateTime.now())
+// .ge(TContract::getEndTime, LocalDateTime.now()));
THouse house = houseService.getById(contract.getHouseId());
- if (oldContract!=null){
- house.setTenantType(oldContract.getPayType());
- }
+ house.setTenantType(contract.getPayType());
res.setHouse(house);
List<TBill> list = billService.lambdaQuery()
.eq(TBill::getContractId, id)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
index 12c8605..198ccc1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -16,6 +16,8 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.validation.constraints.NotBlank;
+
/**
* <p>
* 合同管理
@@ -127,6 +129,7 @@
@ApiModelProperty(value = "合同附件,多个逗号拼接")
@TableField("contract_file")
+ @NotBlank(message = "合同附件不能为空")
private String contractFile;
@ApiModelProperty(value = "备注")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
index 3e62453..259fa72 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
@@ -251,9 +251,10 @@
}
}else{
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{
+ rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
}
// 不走递增递减
long allDays = ChronoUnit.DAYS.between(contract.getFirstPayTime(), rentBill.getEndTime());
diff --git a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
index a4bb3e9..0eefc41 100644
--- a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
@@ -43,6 +43,7 @@
</if>
AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
+ order by t1.create_time desc
</select>
<select id="userHistoryList" resultType="com.ruoyi.system.vo.HouseVO">
select
--
Gitblit v1.7.1