From c474556f44163526700fd7c99a88e37e4297e23f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 27 二月 2025 19:14:23 +0800
Subject: [PATCH] 审批流定时任务
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java | 12 +++++++++---
1 files changed, 9 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..eb76072 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
@@ -113,14 +113,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;
--
Gitblit v1.7.1