From 5d5cd3ad979a0b85ab8c7034dcad1663fdcf71be Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 01 Dec 2023 14:18:53 +0800
Subject: [PATCH] 文章通过范围查询
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
index ec3fd73..1e02036 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.entity.HouseRentalEntity;
import org.springblade.modules.house.entity.HouseTenantEntity;
import org.springblade.modules.house.service.IHouseTenantService;
@@ -28,6 +29,7 @@
import org.springblade.modules.house.mapper.HouseRentalMapper;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.vo.HouseTenantVO;
+import org.springblade.modules.house.excel.HouseRentalExcel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,7 +38,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -51,6 +52,9 @@
@Autowired
private IHouseTenantService houseTenantService;
+ @Autowired
+ private IGridService gridService;
+
/**
* 自定义分页查询
* @param page
@@ -59,7 +63,19 @@
*/
@Override
public IPage<HouseRentalTenantVO> selectHouseRentalPage(IPage<HouseRentalTenantVO> page, HouseRentalTenantVO houseRental) {
- return page.setRecords(baseMapper.selectHouseRentalPage(page, houseRental));
+ List<String> list = new ArrayList<>();
+ if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
+ if (houseRental.getRoleName().equals("网格员")){
+ // 查询对应的房屋地址code
+ list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ }
+ }
+ if (null!=houseRental.getAuditStatus()){
+ if (houseRental.getAuditStatus()==0){
+ houseRental.setAuditStatus(2);
+ }
+ }
+ return page.setRecords(baseMapper.selectHouseRentalPage(page, houseRental,list));
}
/**
@@ -196,8 +212,15 @@
*/
@Override
public Object getStatistics(HouseRentalTenantVO houseRental) {
+ List<String> list = new ArrayList<>();
+ if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
+ if (houseRental.getRoleName().equals("网格员")){
+ // 查询对应的房屋地址code
+ list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ }
+ }
// 查询
- List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental);
+ List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental,list);
// 返回
return statistics;
}
@@ -214,4 +237,20 @@
// 修改
return updateById(houseRental);
}
+
+ /**
+ * 导出租赁信息
+ * @param houseRentalVO
+ * @return
+ */
+ @Override
+ public List<HouseRentalExcel> export(HouseRentalTenantVO houseRentalVO) {
+ List<HouseRentalExcel> houseRentalExcels = baseMapper.export(houseRentalVO);
+ return houseRentalExcels;
+ }
+
+ @Override
+ public Integer getStatisticsCount(HouseRentalTenantVO houseRental) {
+ return baseMapper.getStatisticsCount(AuthUtil.getUserId());
+ }
}
--
Gitblit v1.9.3