From 4c01f95906b62248cc4428d85a323ad64b9fa255 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 一月 2025 10:58:44 +0800
Subject: [PATCH] 房屋
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java
index 594e1e1..436ae5f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java
@@ -1,7 +1,10 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.mapper.TContractMapper;
import com.ruoyi.system.mapper.THouseMapper;
+import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.THouse;
import com.ruoyi.system.query.THouseQuery;
import com.ruoyi.system.query.TUserHistoryQuery;
@@ -10,6 +13,8 @@
import com.ruoyi.system.vo.HouseVO;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -22,11 +27,22 @@
*/
@Service
public class THouseServiceImpl extends ServiceImpl<THouseMapper, THouse> implements THouseService {
-
+ @Resource
+ private TContractMapper contractMapper;
@Override
public PageInfo<THouse> houseList(THouseQuery query) {
PageInfo<THouse> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<THouse> list = this.baseMapper.houseList(query,pageInfo);
+ List<TContract> tContracts = contractMapper.selectList(new LambdaQueryWrapper<TContract>()
+ .eq(TContract::getStatus, 4)
+ .le(TContract::getStartTime, LocalDateTime.now())
+ .ge(TContract::getEndTime, LocalDateTime.now()));
+ for (THouse tHouse : list) {
+ TContract tContract = tContracts.stream().filter(e -> e.getHouseId().equals(tHouse.getId())).findFirst().orElse(null);
+ if (tContract!=null){
+ tHouse.setTenantType(tContract.getPayType());
+ }
+ }
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1