From 25df5530b89fc57a3f32a0e4c706bb40d3e4b415 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 Nov 2023 17:27:58 +0800
Subject: [PATCH] 标签控制+通知详情优化

---
 src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml |   76 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 74 insertions(+), 2 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 2328145..edb7604 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -20,16 +20,88 @@
         <result column="building_no" property="buildingNo"/>
         <result column="image_urls" property="imageUrls"/>
         <result column="create_user" property="createUser"/>
-        <result column="created_time" property="createdTime"/>
+        <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"/>
     </resultMap>
 
+    <sql id="selectHouse">
+        select
+            id,
+            house_code,
+            district_code,
+            district_name,
+            house_name,
+            phone,
+            area,
+            property_price,
+            service_due,
+            floor,
+            building,
+            unit,
+            room,
+            building_no,
+            image_urls,
+            create_user,
+            create_time,
+            update_user,
+            update_time,
+            remark,
+            is_deleted
+        from
+            jczz_house
+    </sql>
 
+
+    <!--房屋详情-->
+    <resultMap id="houseAndHouseLabelMap" type="org.springblade.modules.house.vo.HouseVO" autoMapping="true">
+        <id property="id" column="id"/>
+        <collection property="houseLabelVOList" javaType="java.util.List"
+                    ofType="org.springblade.modules.house.vo.HouseLabelVO" autoMapping="true">
+            <id property="id" column="cid"/>
+            <result property="remark" column="cremark"/>
+        </collection>
+    </resultMap>
+
+    <!--自定义分页列表-->
     <select id="selectHousePage" resultMap="houseResultMap">
-        select * from jczz_house where is_deleted = 0
+        <include refid="selectHouse"/>
+        <where>
+            <if test="house.id != null "> and id = #{house.id}</if>
+            <if test="house.houseCode != null  and house.houseCode != ''"> and house_code = #{house.houseCode}</if>
+            <if test="house.districtCode != null  and house.districtCode != ''"> and district_code = #{house.districtCode}</if>
+            <if test="house.districtName != null  and house.districtName != ''"> and district_name = #{house.districtName}</if>
+            <if test="house.houseName != null  and house.houseName != ''"> and house_name = #{house.houseName}</if>
+            <if test="house.phone != null  and house.phone != ''"> and phone = #{house.phone}</if>
+            <if test="house.area != null "> and area = #{house.area}</if>
+            <if test="house.propertyPrice != null "> and property_price = #{house.propertyPrice}</if>
+            <if test="house.serviceDue != null "> and service_due = #{house.serviceDue}</if>
+            <if test="house.floor != null "> and floor = #{house.floor}</if>
+            <if test="house.building != null  and house.building != ''"> and building = #{house.building}</if>
+            <if test="house.unit != null  and house.unit != ''"> and unit = #{house.unit}</if>
+            <if test="house.room != null  and house.room != ''"> and room = #{house.room}</if>
+            <if test="house.buildingNo != null "> and building_no = #{house.buildingNo}</if>
+            <if test="house.imageUrls != null  and house.imageUrls != ''"> and image_urls = #{house.imageUrls}</if>
+            <if test="house.createUser != null  and house.createUser != ''"> and create_user = #{house.createUser}</if>
+            <if test="house.createTime != null "> and create_time = #{house.createTime}</if>
+            <if test="house.updateUser != null  and house.updateUser != ''"> and update_user = #{house.updateUser}</if>
+            <if test="house.updateTime != null "> and update_time = #{house.updateTime}</if>
+            <if test="house.remark != null  and house.remark != ''"> and remark = #{house.remark}</if>
+            <if test="house.isDeleted != null "> and is_deleted = #{house.isDeleted}</if>
+        </where>
+    </select>
+
+    <!--房屋自定义详情查询-->
+    <select id="getHouseDetail" resultMap="houseAndHouseLabelMap">
+        select
+        jh.*,
+        jhl.id as cid,jhl.*,jhl.remark as cremark
+        from jczz_house jh
+        left join jczz_house_label jhl on jh.house_code = jhl.house_code
+        where jh.is_deleted = 0
+        and jh.house_code = #{house.houseCode}
     </select>
 
 

--
Gitblit v1.9.3