From 811bec0382e7202aafdca01d2f64bd8456905fd8 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 31 Oct 2023 17:23:06 +0800
Subject: [PATCH] 户室信息查看修改
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java | 7 +++
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 19 +++++++++
src/main/java/org/springblade/modules/house/service/IHouseholdService.java | 7 +++
src/main/java/org/springblade/modules/house/vo/HouseholdVO.java | 8 ++++
src/main/java/org/springblade/modules/house/vo/HouseRentalVO.java | 5 ++
src/main/java/org/springblade/modules/doorplateAddress/vo/FuncNode.java | 5 ++
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 14 +++++--
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 2
src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java | 3 +
src/main/resources/application.yml | 3 +
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 10 +++++
11 files changed, 77 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index 9973c01..4320e41 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -31,6 +31,7 @@
import org.springblade.modules.house.service.IHouseholdLabelService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseRentalVO;
+import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.service.IPlaceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -175,10 +176,15 @@
public Object getHouseRentInfo(String code) {
// 先查询门牌信息
DoorplateAddressVO doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByCode(code);
- // 查询房屋出租情况
- List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
- // 设置数据
- doorplateAddressDetailVO.setHouseRentalList(houseRentalVOS);
+ if(null!= doorplateAddressDetailVO) {
+ // 查询房屋出租情况
+ List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
+ // 查询房屋人员情况
+ List<HouseholdVO> householdVOS = householdService.getHouseholdListByCode(code);
+ // 设置数据
+ doorplateAddressDetailVO.setHouseRentalList(houseRentalVOS);
+ doorplateAddressDetailVO.setHouseholdList(householdVOS);
+ }
// 返回
return doorplateAddressDetailVO;
}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java b/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java
index f119c4f..ad1cd1e 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java
@@ -4,6 +4,7 @@
import lombok.EqualsAndHashCode;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.house.vo.HouseRentalVO;
+import org.springblade.modules.house.vo.HouseholdVO;
import java.util.ArrayList;
import java.util.List;
@@ -21,4 +22,6 @@
private List<HouseRentalVO> houseRentalList = new ArrayList<>();
+ private List<HouseholdVO> householdList = new ArrayList<>();
+
}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/vo/FuncNode.java b/src/main/java/org/springblade/modules/doorplateAddress/vo/FuncNode.java
index ab03acb..6d961f1 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/vo/FuncNode.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/vo/FuncNode.java
@@ -44,6 +44,11 @@
private String roleType;
/**
+ * 居住状态
+ */
+ private String residentialStatus;
+
+ /**
* 子孙节点
*/
private List<FuncNode> children = new ArrayList<>();
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
index f920577..6703d6f 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -39,7 +39,7 @@
<!--查询房屋出租情况-->
<select id="getHouseRentalListByCode" resultMap="houseRentalTenant">
select
- jhr.*,
+ jhr.*,if(date_format(jhr.due_time,'%Y-%m-%d') >= date_format(now(),'%Y-%m-%d'),0,1) as status,
jht.id as tenantId,jht.*
from jczz_house_rental jhr
left join jczz_house_tenant jht on jhr.id = jht.housing_rental_id
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
index 69d9f03..4402322 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -48,4 +48,11 @@
* @return
*/
List<TreeNode> selectHouseNodeList(@Param("userId") Long userId);
+
+ /**
+ * 查询房屋人员情况
+ * @param code
+ * @return
+ */
+ List<HouseholdVO> getHouseholdListByCode(@Param("code") String code);
}
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 e9661e6..792e251 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -39,6 +39,14 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <resultMap id="householdAndLabelMap" type="org.springblade.modules.house.vo.HouseholdVO" autoMapping="true">
+ <id property="id" column="id"/>
+ <collection property="householdLabelList" javaType="java.util.List"
+ ofType="org.springblade.modules.house.vo.HouseholdLabelVO" autoMapping="true">
+ <id property="id" column="cid"/>
+ </collection>
+ </resultMap>
+
<!--自定义分页数据查询-->
<select id="selectHouseholdPage" resultMap="householdResultMap">
select * from jczz_household where is_deleted = 0
@@ -52,5 +60,16 @@
and associated_user_id = #{userId}
</select>
+ <!--查询房屋集合信息-->
+ <select id="getHouseholdListByCode" resultMap="householdAndLabelMap" >
+ select
+ jh.*,
+ jhl.id as cid,jhl.*
+ from jczz_household jh
+ left join jczz_household_label jhl on jh.id = jhl.household_id
+ where 1=1
+ and house_code = #{code}
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
index 8fb24df..547c55d 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -48,4 +48,11 @@
* @return
*/
List<TreeNode> selectHouseNodeList(Long userId);
+
+ /**
+ * 查询房屋人员情况
+ * @param code
+ * @return
+ */
+ List<HouseholdVO> getHouseholdListByCode(String code);
}
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 13561d6..a727ebb 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -51,4 +51,14 @@
public List<TreeNode> selectHouseNodeList(Long userId) {
return baseMapper.selectHouseNodeList(userId);
}
+
+ /**
+ * 查询房屋人员情况
+ * @param code
+ * @return
+ */
+ @Override
+ public List<HouseholdVO> getHouseholdListByCode(String code) {
+ return baseMapper.getHouseholdListByCode(code);
+ }
}
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseRentalVO.java b/src/main/java/org/springblade/modules/house/vo/HouseRentalVO.java
index d0dd9e2..526686b 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseRentalVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseRentalVO.java
@@ -41,6 +41,11 @@
private Integer number;
/**
+ * 是否到期 0：未到期 1：已到期
+ */
+ private Integer status;
+
+ /**
* 租户集合信息
*/
private List<HouseTenantVO> houseTenantVOList = new ArrayList<>();
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
index 9d7f410..e93a580 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
@@ -21,6 +21,9 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* 住户 视图实体类
*
@@ -32,4 +35,9 @@
public class HouseholdVO extends HouseholdEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * 标签
+ */
+ private List<HouseholdLabelVO> householdLabelList = new ArrayList<>();
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cff1e91..0330891 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -182,7 +182,7 @@
#jackson配置
jackson:
#null自动转空值
- null-to-empty: true
+ null-to-empty: false
#大数字自动转字符串
big-num-to-string: true
#支持text文本请求,与报文加密同时开启
@@ -199,6 +199,7 @@
#接口放行
skip-url:
- /blade-test/**
+ - /blade-doorplateAddress/doorplateAddress/**
#授权认证配置
auth:
- method: ALL
--
Gitblit v1.9.3