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 | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 f20404c..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
@@ -7,11 +7,13 @@
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;
@@ -113,14 +115,20 @@
@Override
public PageInfo<TBillVO> listBill(TBillAppletQuery query) {
- List<String> contractIds = contractMapper.selectList(new LambdaQueryWrapper<TContract>()
- .eq(TContract::getTenantId, query.getId())).stream().map(TContract::getId)
+ List<TContract> tContracts = contractMapper.selectList(new LambdaQueryWrapper<TContract>()
+ .eq(TContract::getTenantId, query.getId()));
+ List<String> contractIds = tContracts.stream().map(TContract::getId)
.collect(Collectors.toList());
if (contractIds.isEmpty())contractIds.add("0");
PageInfo<TBillVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TBillVO> list = this.baseMapper.listBill(query,pageInfo);
for (TBillVO tBillVO : list) {
- tBillVO.setPayFeesStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tBillVO.getPayFeesStatus()));
+ TContract contract = tContracts.stream().filter(e -> e.getId().equals(tBillVO.getContractId()))
+ .findFirst().orElse(null);
+ if (contract!=null){
+ tBillVO.setHouse(houseMapper.selectById(contract.getHouseId()));
+ }
+ tBillVO.setPayFeesStatus(tBillVO.getPayFeesStatus());
}
pageInfo.setRecords(list);
return pageInfo;
@@ -133,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