java/xizang.git

			@@ -1,6 +1,7 @@
			package com.ruoyi.system.service.impl;

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.ruoyi.common.basic.PageInfo;
			import com.ruoyi.common.constant.DictConstants;
			import com.ruoyi.common.utils.DictUtils;
			@@ -12,12 +13,12 @@
			import com.ruoyi.system.query.THouseQuery;
			import com.ruoyi.system.query.TUserHistoryQuery;
			import com.ruoyi.system.service.THouseService;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.ruoyi.system.vo.HouseVO;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.time.LocalDateTime;
			import java.util.Arrays;
			import java.util.List;

			/**
			@@ -37,7 +38,7 @@
			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)
			.in(TContract::getStatus, Arrays.asList(4,6,7))
			.le(TContract::getStartTime, LocalDateTime.now())
			.ge(TContract::getEndTime, LocalDateTime.now()));
			for (THouse tHouse : list) {
			@@ -46,10 +47,11 @@
			if (tContract!=null){
			tHouse.setTenantType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,tContract.getPayType()));
			// tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,"2"));
			tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,"2"));

			}else{
			// tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
			tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
			}
			tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));

			}
			pageInfo.setRecords(list);
			@@ -62,6 +64,7 @@
			List<HouseVO> list = this.baseMapper.userHistoryList(query,pageInfo);
			for (HouseVO houseVO : list) {
			houseVO.setTenantAttributes(StringUtils.isNotEmpty(houseVO.getTenantAttributes())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,houseVO.getTenantAttributes()):"");
			houseVO.setProductType(StringUtils.isNotEmpty(houseVO.getTenantType())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_TYPE,houseVO.getTenantType()):"");
			}
			pageInfo.setRecords(list);
			return pageInfo;