From d0b0e00e40226700a0ffa1f1671a8dc273610f67 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 18 Dec 2023 14:28:10 +0800
Subject: [PATCH] 菜单分类优化
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 80d2e50..8be71b1 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
@@ -80,7 +80,25 @@
houseRental.setAuditStatus(2);
}
}
- return page.setRecords(baseMapper.selectHouseRentalPage(page, houseRental,list));
+ List<HouseRentalTenantVO> houseRentalTenantVOS = baseMapper.selectHouseRentalPage(page, houseRental, list);
+ for (HouseRentalTenantVO houseRentalTenantVO : houseRentalTenantVOS) {
+ if(houseRentalTenantVO.getStatus().equals(1)){
+ houseRentalTenantVO.setStatus(30);
+ }
+ if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(0)){
+ houseRentalTenantVO.setStatus(0);
+ }
+ if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(1)){
+ houseRentalTenantVO.setStatus(1);
+ }
+ if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(3)){
+ houseRentalTenantVO.setStatus(20);
+ }
+ if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(2)){
+ houseRentalTenantVO.setStatus(10);
+ }
+ }
+ return page.setRecords(houseRentalTenantVOS);
}
/**
@@ -103,6 +121,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean add(HouseRentalVO houseRentalVO) {
+ // 判断添加人是否房屋业主
+ Long count = iHouseholdService.count(Wrappers.<HouseholdEntity>lambdaQuery()
+ .eq(HouseholdEntity::getHouseCode, houseRentalVO.getHouseCode())
+ .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
+ .eq(HouseholdEntity::getRelationship, 1));
+ if (count == 0) {
+ return false;
+ }
houseRentalVO.setCreateUser(AuthUtil.getUserId());
houseRentalVO.setCreateTime(new Date());
houseRentalVO.setUpdateUser(AuthUtil.getUserId());
--
Gitblit v1.9.3