xuhy
2025-02-27 c474556f44163526700fd7c99a88e37e4297e23f
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;