From 23c4967b4cb8dbce8277f830f7152d315c5a4a57 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 25 十二月 2023 09:25:17 +0800
Subject: [PATCH] 12.25

---
 guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HousingDemandMapper.xml |  104 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HousingDemandMapper.xml b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HousingDemandMapper.xml
index 6fdf4c0..2c87d57 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HousingDemandMapper.xml
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HousingDemandMapper.xml
@@ -17,7 +17,11 @@
         hd.garden,
         hd.carport,
         hd.balcony,
+        hd.air,
         hd.type,
+        hd.data_type as dataType,
+        hd.views_number as viewsNumber,
+        hd.type as `type`,
         hd.keep_pet as keepPet
         from t_housing_demand hd
         left join t_app_user au on (hd.app_user_id = au.id)
@@ -26,10 +30,19 @@
             and hd.data_type = #{req.type}
         </if>
         <if test="null != req.content and '' != req.content">
-            and hd.title = CONCAT('%', #{req.content}, '%')
+            and hd.title like CONCAT('%', #{req.content}, '%')
         </if>
-        <if test="null != district and '' != district">
-            and hd.id in (select housing_demand_id from t_housing_demand_district where CONCAT('cityId:', city_id, ',districtId:', district_id) in
+        <if test="null != cityIds and cityIds.size()>0">
+            and hd.id in (select housing_demand_id from t_housing_demand_district
+            where t_housing_demand_district.district_id in
+            <foreach collection="cityIds" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
+        </if>
+        <if test="null != district and district.size()>0">
+            and hd.id in (select housing_demand_id from t_housing_demand_district
+            where t_housing_demand_district.city_id in
             <foreach collection="district" item="item" index="index" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -53,9 +66,7 @@
         <if test="null != req.elevator">
             and hd.elevator = #{req.elevator}
         </if>
-        <if test="null != req.rentalDuration">
-            and hd.rental_duration = #{req.rentalDuration}
-        </if>
+
         <if test="null != req.balcony">
             and hd.balcony = #{req.balcony}
         </if>
@@ -80,6 +91,9 @@
         <if test="null != req.sort and req.sort == 1">
             order by hd.insert_time desc
         </if>
+        <if test="null != req.sort and req.sort == 2">
+            order by hd.views_number desc
+        </if>
         <if test="null != req.sort and req.sort == 3">
             order by hd.sale_amount
         </if>
@@ -88,8 +102,6 @@
         </if>
         limit #{req.pageNum}, #{req.pageSize}
     </select>
-
-
 
     <select id="searchHousingDemandCount" resultType="int">
         select
@@ -102,8 +114,17 @@
         <if test="null != req.content and '' != req.content">
             and hd.title = CONCAT('%', #{req.content}, '%')
         </if>
-        <if test="null != district and '' != district">
-            and hd.id in (select housing_demand_id from t_housing_demand_district where CONCAT('cityId:', city_id, ',districtId:', district_id) in
+        <if test="null != cityIds and cityIds.size()>0">
+            and hd.id in (select housing_demand_id from t_housing_demand_district
+            where t_housing_demand_district.city_id in
+            <foreach collection="cityIds" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
+        </if>
+        <if test="null != district and district.size()>0">
+            and hd.id in (select housing_demand_id from t_housing_demand_district
+            where t_housing_demand_district.district_id in
             <foreach collection="district" item="item" index="index" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -152,4 +173,67 @@
             and now() &lt;= DATE_ADD(hd.insert_time,INTERVAL 3 MONTH)
         </if>
     </select>
+    <select id="searchHousingDemand1"
+            resultType="com.stylefeng.guns.modular.system.warpper.res.SearchHousingDemandListRes">
+        select
+        hd.id,
+        hd.app_user_id as appuserId,
+        hd.title,
+        hd.house_model as houseModel,
+        hd.sale_amount as saleAmount,
+        au.profile_photo as profilePhoto,
+        au.nickname,
+        hd.elevator,
+        hd.rental_duration as rentalDuration,
+        hd.drying_area as dryingArea,
+        hd.garden,
+        hd.carport,
+        hd.balcony,
+        hd.views_number as viewsNumber,
+        hd.type,
+        hd.status,
+        hd.data_type as dataType,
+        hd.insert_time as insertTime,
+        hd.type as `type`,
+        hd.keep_pet as keepPet
+        from t_housing_demand hd
+        left join t_app_user au on (hd.app_user_id = au.id)
+        where hd.is_delete = 0
+        and hd.app_user_id = #{id}
+    </select>
+    <select id="searchHousingDemand2"
+            resultType="com.stylefeng.guns.modular.system.warpper.res.SearchHousingDemandListRes">
+        select
+        hd.id,
+        hd.app_user_id as appuserId,
+        hd.title,
+        hd.house_model as houseModel,
+        hd.sale_amount as saleAmount,
+        au.profile_photo as profilePhoto,
+        au.nickname,
+        hd.elevator,
+        hd.rental_duration as rentalDuration,
+        hd.drying_area as dryingArea,
+        hd.garden,
+        hd.carport,
+        hd.balcony,
+        hd.views_number as viewsNumber,
+        hd.type,
+        hd.status,
+        hd.data_type as dataType,
+        hd.insert_time as insertTime,
+        hd.type as `type`,
+        hd.keep_pet as keepPet
+        from t_housing_demand hd
+        left join t_app_user au on (hd.app_user_id = au.id)
+        where hd.`status` = 1 and hd.is_delete = 0
+
+        <if test="null != ids and ids.size()>0">
+            and hd.id in
+            <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.7.1