From 5f7955a12fd38f609a0b70db6251edb5315c6dd0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 一月 2025 13:54:09 +0800
Subject: [PATCH] 租户房屋接口对接
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 e2d0e9e..cddd624 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
@@ -12,20 +12,25 @@
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.TContractRentType;
import com.ruoyi.system.model.THouse;
+import com.ruoyi.system.query.TContractQuery;
import com.ruoyi.system.query.THouseQuery;
import com.ruoyi.system.query.TUserHistoryQuery;
import com.ruoyi.system.service.TContractRentTypeService;
import com.ruoyi.system.service.TContractService;
import com.ruoyi.system.service.THouseService;
import com.ruoyi.system.vo.HouseVO;
+import io.swagger.annotations.Api;
import com.ruoyi.system.vo.TContractVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
import java.util.Arrays;
+import java.util.List;
/**
* <p>
@@ -43,6 +48,13 @@
private TContractService contractService;
@Autowired
private TContractRentTypeService contractRentTypeService;
+ @Autowired
+ private THouseService houseService;
+ @ApiOperation(value = "获取合同分页列表")
+ @PostMapping(value = "/contractList")
+ public AjaxResult<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
+ return AjaxResult.success(contractService.contractList(query));
+ }
@Log(title = "合同管理-新增合同", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增合同")
@PostMapping(value = "/addContract")
@@ -91,7 +103,24 @@
@ApiOperation(value = "查询合同信息信息")
@GetMapping(value = "/getContractById")
public AjaxResult<TContractVO> getContractById(@RequestParam Long id) {
- return AjaxResult.success(contractService.getById(id));
+ TContractVO res = new TContractVO();
+ TContract contract = contractService.getById(id);
+ BeanUtils.copyProperties(contract,res);
+ TContractRentType contractRentType = contractRentTypeService.lambdaQuery().eq(TContractRentType::getContractId, id).one();
+ 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()));
+ THouse house = houseService.getById(contract.getHouseId());
+ if (oldContract!=null){
+ house.setTenantType(oldContract.getPayType());
+ }
+ res.setHouse(house);
+ return AjaxResult.success();
}
}
--
Gitblit v1.7.1