From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
index e11cd4b..0c1e19f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
@@ -1,16 +1,19 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.dto.TTenantDTO;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.TContractMapper;
import com.ruoyi.system.mapper.THouseMapper;
import com.ruoyi.system.mapper.TTenantMapper;
import com.ruoyi.system.model.TContract;
+import com.ruoyi.system.model.TDept;
import com.ruoyi.system.model.THouse;
import com.ruoyi.system.model.TTenant;
import com.ruoyi.system.query.TBillAppletQuery;
@@ -18,18 +21,16 @@
import com.ruoyi.system.query.TTenantAppletQuery;
import com.ruoyi.system.query.TTenantQuery;
import com.ruoyi.system.service.TTenantService;
-import com.ruoyi.system.utils.wx.pojo.AppletUserDecodeData;
import com.ruoyi.system.vo.ExamineVO;
import com.ruoyi.system.vo.TBillVO;
import com.ruoyi.system.vo.TenantVO;
-import com.sun.corba.se.spi.ior.IdentifiableFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.token.TokenService;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
-import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -47,10 +48,6 @@
private THouseMapper houseMapper;
@Autowired
private TContractMapper contractMapper;
- @Autowired
- private SysUserMapper sysUserMapper;
- @Autowired
- private TokenService tokenService;
@Override
public PageInfo<TenantVO> pageList(TTenantQuery query) {
PageInfo<TenantVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
@@ -67,9 +64,32 @@
public PageInfo<TenantVO> pageListApplet(TTenantAppletQuery query) {
PageInfo<TenantVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TenantVO> list = this.baseMapper.pageListApplet(query,pageInfo);
+ List<String> ids = list.stream().map(TTenant::getId).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(ids)){
+ return new PageInfo<>();
+ }
+ List<TContract> contracts = contractMapper.selectList(Wrappers.lambdaQuery(TContract.class)
+ .in(TContract::getTenantId, ids)
+ .eq(TContract::getStatus, 4));
+ List<THouse> houses = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(contracts)){
+ List<String> houseIds = contracts.stream().map(TContract::getHouseId).collect(Collectors.toList());
+ houses = houseMapper.selectList(Wrappers.lambdaQuery(THouse.class)
+ .in(THouse::getId, houseIds));
+ }
+
for (TenantVO tenantVO : list) {
tenantVO.setTenantAttributesName(StringUtils.isNotBlank(tenantVO.getTenantAttributes())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,tenantVO.getTenantAttributes()):"");
tenantVO.setTenantTypeName(StringUtils.isNotBlank(tenantVO.getTenantType())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_TYPE,tenantVO.getTenantType()):"");
+ if(!CollectionUtils.isEmpty(houses)){
+ List<TContract> contractList = contracts.stream().filter(contract -> contract.getTenantId().equals(tenantVO.getId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(contractList)){
+ TContract contract = contractList.get(0);
+ List<THouse> houseList = houses.stream().filter(house -> house.getId().equals(contract.getHouseId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(houseList))
+ tenantVO.setHouseName(houseList.get(0).getHouseName());
+ }
+ }
}
pageInfo.setRecords(list);
return pageInfo;
@@ -108,7 +128,7 @@
if (contract!=null){
tBillVO.setHouse(houseMapper.selectById(contract.getHouseId()));
}
- tBillVO.setPayFeesStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tBillVO.getPayFeesStatus()));
+ tBillVO.setPayFeesStatus(tBillVO.getPayFeesStatus());
}
pageInfo.setRecords(list);
return pageInfo;
@@ -121,4 +141,15 @@
pageInfo.setRecords(list);
return pageInfo;
}
+
+ @Override
+ public boolean isExit(TTenantDTO dto) {
+ if(StringUtils.isNotEmpty(dto.getId())){
+ // 修改
+ return this.count(Wrappers.lambdaQuery(TTenant.class).ne(TTenant::getId, dto.getId()).eq(TTenant::getPhone, dto.getPhone())) > 0;
+ }else {
+ // 新增
+ return this.count(Wrappers.lambdaQuery(TTenant.class).eq(TTenant::getPhone, dto.getPhone())) > 0;
+ }
+ }
}
--
Gitblit v1.7.1