From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 ba2c11c..d9552a8 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
@@ -83,19 +83,19 @@
List<HouseRentalTenantVO> houseRentalTenantVOS = baseMapper.selectHouseRentalPage(page, houseRental, list);
for (HouseRentalTenantVO houseRentalTenantVO : houseRentalTenantVOS) {
if(houseRentalTenantVO.getStatus().equals(1)){
- houseRentalTenantVO.setAuditStatus(30);
+ houseRentalTenantVO.setStatus(30);
}
if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(0)){
- houseRentalTenantVO.setAuditStatus(0);
+ houseRentalTenantVO.setStatus(0);
}
if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(1)){
- houseRentalTenantVO.setAuditStatus(1);
+ houseRentalTenantVO.setStatus(1);
}
if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(3)){
- houseRentalTenantVO.setAuditStatus(20);
+ houseRentalTenantVO.setStatus(20);
}
if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(2)){
- houseRentalTenantVO.setAuditStatus(10);
+ houseRentalTenantVO.setStatus(10);
}
}
return page.setRecords(houseRentalTenantVOS);
@@ -121,10 +121,20 @@
@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());
houseRentalVO.setUpdateTime(new Date());
+ // 网格员新增默认是审核通过
+ houseRentalVO.setAuditStatus(1);
//保存自身
boolean save = save(houseRentalVO);
List<String> phoneList = new ArrayList<>();
@@ -174,10 +184,8 @@
boolean update = iHouseholdService.update(Wrappers.<HouseholdEntity>lambdaUpdate()
.set(HouseholdEntity::getIsDeleted, 1)
.eq(HouseholdEntity::getHousingRentalId, id));
- if (update) {
- return true && b;
- }
- return false;
+ // 返回
+ return b;
}
/**
--
Gitblit v1.9.3