From 861e9b1eb145094dff6d1caf3dba30d7ce0e11d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 02 Mar 2024 17:40:38 +0800
Subject: [PATCH] 房屋查询过滤
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 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 fc32ad9..0d94abf 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
@@ -67,14 +67,15 @@
/**
* 自定义分页查询
+ *
* @param page
* @param houseRental
* @return
*/
@Override
public IPage<HouseRentalTenantVO> selectHouseRentalPage(IPage<HouseRentalTenantVO> page, HouseRentalTenantVO houseRental) {
- if (null!=houseRental.getAuditStatus()){
- if (houseRental.getAuditStatus()==0){
+ if (null != houseRental.getAuditStatus()) {
+ if (houseRental.getAuditStatus() == 0) {
houseRental.setAuditStatus(2);
}
}
@@ -84,19 +85,19 @@
commonParamSet.getRegionChildCodesList(),
commonParamSet.getIsAdministrator());
for (HouseRentalTenantVO houseRentalTenantVO : houseRentalTenantVOS) {
- if(houseRentalTenantVO.getStatus().equals(1)){
+ if (houseRentalTenantVO.getStatus().equals(1)) {
houseRentalTenantVO.setStatus(30);
}
- if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(0)){
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(0)) {
houseRentalTenantVO.setStatus(0);
}
- if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(1)){
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(1)) {
houseRentalTenantVO.setStatus(1);
}
- if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(3)){
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(3)) {
houseRentalTenantVO.setStatus(20);
}
- if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(2)){
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(2)) {
houseRentalTenantVO.setStatus(10);
}
}
@@ -105,6 +106,7 @@
/**
* 查询房屋出租情况
+ *
* @param code
* @return
*/
@@ -117,6 +119,7 @@
/**
* 自定义房屋出租新增
+ *
* @param houseRentalVO
* @return
*/
@@ -133,7 +136,7 @@
// 获取请求头中的角色别名
String roleName = SpringUtils.getRequestParam("roleName");
// 居民
- if (!Strings.isBlank(roleName) && roleName.equals("inhabitant")){
+ if (!Strings.isBlank(roleName) && roleName.equals("inhabitant")) {
// 待审核
houseRentalVO.setAuditStatus(0);
}
@@ -146,12 +149,13 @@
/**
* 保存租户信息
+ *
* @param houseRentalVO
* @param flag
* @return
*/
public boolean saveHousehold(HouseRentalVO houseRentalVO, boolean flag) {
- if (flag && houseRentalVO.getHouseholdVOList().size()>0) {
+ if (flag && houseRentalVO.getHouseholdVOList().size() > 0) {
List<String> phoneList = new ArrayList<>();
List<HouseholdEntity> householdEntityList = new ArrayList<>();
houseRentalVO.getHouseholdVOList().forEach(e -> {
@@ -181,13 +185,14 @@
} catch (Exception e) {
log.error("保存用户角色为居民：", e);
}
- flag = iHouseholdService.saveBatch(householdEntityList);
+ flag = iHouseholdService.saveBatch(householdEntityList);
}
return flag;
}
/**
* 出租屋 自定义删除
+ *
* @param id
* @return
*/
@@ -205,6 +210,7 @@
/**
* 出租屋 自定义修改
+ *
* @param houseRental
* @return
*/
@@ -254,7 +260,7 @@
e.getId()).collect(Collectors.toList()).contains(vo.getId())).collect(Collectors.toList());
// 批量新增
- if (addList.size()>0) {
+ if (addList.size() > 0) {
addFlag = iHouseholdService.saveBatch(addList);
}
// 批量修改
@@ -292,25 +298,27 @@
/**
* 获取统计数据
+ *
* @return
*/
@Override
public Object getStatistics(HouseRentalTenantVO houseRental) {
List<String> list = new ArrayList<>();
- if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
- if (houseRental.getRoleName().equals("网格员")){
+ if (null != houseRental.getRoleName() && !houseRental.getRoleName().equals("")) {
+ if (houseRental.getRoleName().equals("网格员")) {
// 查询对应的房屋地址code
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
}
// 查询
- List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental,list);
+ List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental, list);
// 返回
return statistics;
}
/**
* 出租屋 确认
+ *
* @param houseRental
* @return
*/
@@ -324,6 +332,7 @@
/**
* 导出租赁信息
+ *
* @param houseRentalVO
* @return
*/
@@ -335,6 +344,8 @@
@Override
public Integer getStatisticsCount(HouseRentalTenantVO houseRental) {
- return baseMapper.getStatisticsCount(houseRental.getUserId(), houseRental.getNeiCode());
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(HouseRentalTenantVO.class, houseRental);
+ return baseMapper.getStatisticsCount(houseRental, commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator());
}
}
--
Gitblit v1.9.3