From 1c8fc3df880a10625fe8326af8d6442d8f90f398 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 09 Dec 2023 13:29:18 +0800
Subject: [PATCH] 出租人员信息完善
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 8 +++++++-
src/main/java/org/springblade/common/node/TreeStringNode.java | 10 ++++++++++
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 18 +++++++++++++-----
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/common/node/TreeStringNode.java b/src/main/java/org/springblade/common/node/TreeStringNode.java
index b8d0995..ca4e0c1 100644
--- a/src/main/java/org/springblade/common/node/TreeStringNode.java
+++ b/src/main/java/org/springblade/common/node/TreeStringNode.java
@@ -34,6 +34,11 @@
private String neiName;
/**
+ * 小区编码
+ */
+ private String aoiCode;
+
+ /**
* 门牌类型
*/
private String doorplateType;
@@ -55,6 +60,11 @@
private Integer addressType;
/**
+ * 与角色关系
+ */
+ private Integer relationship;
+
+ /**
* 父节点ID
*/
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index b60cee6..e6eecf3 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -116,6 +116,10 @@
<if test="household.confirmFlag != null ">
and jh.confirm_flag = #{household.confirmFlag}
</if>
+
+ <if test="household.housingRentalId != null ">
+ and jh.housing_rental_id = #{household.housingRentalId}
+ </if>
</select>
<!--查询房屋集合信息-->
@@ -126,7 +130,9 @@
false as hasChildren,
jda.doorplate_type doorplateType,
jda.address_level addressLevel,
- jda.nei_name neiName
+ jda.nei_name neiName,
+ jda.aoi_code aoiCode,
+ jh.relationship relationship
from jczz_household jh
left join jczz_doorplate_address jda on jh.house_code = jda.address_code
where 1 = 1
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..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
@@ -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,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