From 72e02952b154a321ed384b73eb0351e7384fa04e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 17 Jan 2024 19:25:01 +0800
Subject: [PATCH] 走访日志查询过滤修改,房屋详情查询bug 修复

---
 src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index 81a1a44..0ab811e 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -200,8 +200,38 @@
 
     </select>
 
+    <!--房屋详情-->
+    <resultMap id="houseAndHouseLabelDetailMap" type="org.springblade.modules.house.vo.HouseVO" autoMapping="true">
+        <result column="id" property="id"/>
+        <result column="house_code" property="houseCode"/>
+        <result column="district_code" property="districtCode"/>
+        <result column="district_name" property="districtName"/>
+        <result column="house_name" property="houseName"/>
+        <result column="phone" property="phone"/>
+        <result column="area" property="area"/>
+        <result column="property_price" property="propertyPrice"/>
+        <result column="service_due" property="serviceDue"/>
+        <result column="floor" property="floor"/>
+        <result column="building" property="building"/>
+        <result column="unit" property="unit"/>
+        <result column="room" property="room"/>
+        <result column="building_no" property="buildingNo"/>
+        <result column="image_urls" property="imageUrls"/>
+        <result column="create_user" property="createUser"/>
+        <result column="created_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="remark" property="remark"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <collection property="userHouseLabelVOList" javaType="java.util.List"
+                    ofType="org.springblade.modules.house.vo.UserHouseLabelVO" autoMapping="true">
+            <id property="id" column="cid"/>
+            <result property="remark" column="cremark"/>
+        </collection>
+    </resultMap>
+
     <!--房屋自定义详情查询-->
-    <select id="getHouseDetail" resultMap="houseAndHouseLabelMap">
+    <select id="getHouseDetail" resultMap="houseAndHouseLabelDetailMap">
         select
         jh.*,
         jhl.id as cid,jhl.*,jhl.remark as cremark,

--
Gitblit v1.9.3