From 59f63a8ef0078b06f010d25abfef2772c944a56f Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 02 一月 2024 15:11:52 +0800
Subject: [PATCH] 1.2
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml | 284 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 241 insertions(+), 43 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml
index e872552..a9a56a5 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml
@@ -15,6 +15,135 @@
concat(rp.`name`, rc.`name`) as address,
hr.longitude,
hr.latitude,
+ hr.platform,
+ hr.sale_amount as saleAmount,
+ IFNULL(su.`name`,au.nickname) as nickname,
+ IFNULL(au.profile_photo,su.avatar) as profilePhoto,
+ au.profile_photo as profilePhoto,
+ hr.drying_area as dryingArea,
+ hr.garden,
+ hr.carport,
+ hr.air,
+ hr.balcony,
+ hr.is_manage as isManage,
+ hr.leaseTime,
+ tp.name as houseTypeName,
+ hr.keep_pet as keepPet
+ from t_house_resource hr
+ left join t_app_user au on (hr.app_user_id = au.id)
+ LEFT JOIN sys_user su ON hr.insert_user_id = su.id AND hr.is_manage = 1
+ left join t_region rc on (hr.district_id = rc.id)
+ left join t_region rp on (rp.id = rc.parent_id)
+ left join t_house_type tp on hr.house_type_id = tp.id
+ where hr.is_delete = 0 and hr.`status` = 1 and hr.auth_status = 2 and hr.type=2
+ <if test="null != req.type and 2 == req.type">
+ and hr.data_type = #{req.type}
+ </if>
+ <if test="null != req.type and 1 == req.type">
+ and hr.data_type = #{req.type}
+ </if>
+ <if test="null != req.userType and 2 == req.userType">
+ and au.user_type = 2
+ </if>
+ <if test="null != req.userType and 3 == req.userType">
+ and au.user_type = 3
+ </if>
+ <if test="null == req.userType">
+ and hr.firm_house != 1
+ </if>
+ <if test="null != req.userType and 4 == req.userType">
+ and hr.firm_house = 1
+ </if>
+ <if test="null != req.content and '' != req.content">
+ and hr.title like CONCAT('%', #{req.content}, '%')
+ </if>
+ <if test="null != cityIds and cityIds.size()>0" >
+ and hr.district_id in
+ <foreach collection="cityIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="null != districtIds and districtIds.size()>0">
+ and hr.city_id in
+ <foreach collection="districtIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="null != saleAmountStart and null != saleAmountEnd">
+ and hr.sale_amount >= #{saleAmountStart} and hr.sale_amount < #{saleAmountEnd}
+ </if>
+ <if test="null != houseModels">
+ and hr.house_model in
+ <foreach collection="houseModels" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="null != req.elevator">
+ and hr.elevator = #{req.elevator}
+ </if>
+ <if test="null != houseTypeIds">
+ and hr.house_type_id in
+ <foreach collection="houseTypeIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="null != req.rentalDuration">
+ and hr.rental_duration = #{req.rentalDuration}
+ </if>
+ <if test="null != req.balcony">
+ and hr.balcony = #{req.balcony}
+ </if>
+ <if test="null != req.keepPet">
+ and hr.keep_pet = #{req.keepPet}
+ </if>
+ <if test="null != req.createTime and req.createTime == 3">
+ and now() <= DATE_ADD(hr.insert_time,INTERVAL 3 day)
+ </if>
+ <if test="null != req.createTime and req.createTime == 7">
+ and now() <= DATE_ADD(hr.insert_time,INTERVAL 7 day)
+ </if>
+ <if test="null != req.createTime and req.createTime == 30">
+ and now() <= DATE_ADD(hr.insert_time,INTERVAL 1 MONTH)
+ </if>
+ <if test="null != req.createTime and req.createTime == 60">
+ and now() <= DATE_ADD(hr.insert_time,INTERVAL 2 MONTH)
+ </if>
+ <if test="null != req.createTime and req.createTime == 90">
+ and now() <= DATE_ADD(hr.insert_time,INTERVAL 3 MONTH)
+ </if>
+ <if test="null != req.dataType and req.dataType == 1">
+ and hr.good_house = 1
+ </if>
+ <if test="null != req.dataType and req.dataType == 2">
+ and now() <= DATE_ADD(hr.insert_time,INTERVAL 21 day)
+ </if>
+ order by au.user_type desc
+ <if test="null != req.sort and req.sort == 1">
+ ,hr.insert_time desc
+ </if>
+ <if test="null != req.sort and req.sort == 2">
+ , hr.views_number desc
+ </if>
+ <if test="null != req.sort and req.sort == 3">
+ , hr.sale_amount
+ </if>
+ <if test="null != req.sort and req.sort == 4">
+ , hr.sale_amount desc
+ </if>
+ limit #{req.pageNum}, #{req.pageSize}
+ </select>
+ <select id="searchHouseResource1" resultType="com.stylefeng.guns.modular.system.warpper.res.SearchHouseResourceListRes">
+ select
+ hr.id,
+ au.user_type as houseResource,
+ hr.house_photo as imgUrl,
+ hr.title,
+ hr.house_area as houseArea,
+ hr.house_model as houseModel,
+ concat(rp.`name`, rc.`name`) as address,
+ hr.longitude,
+ hr.latitude,
+ hr.platform,
hr.sale_amount as saleAmount,
au.profile_photo as profilePhoto,
au.nickname,
@@ -22,34 +151,44 @@
hr.drying_area as dryingArea,
hr.garden,
hr.carport,
+ hr.air,
hr.balcony,
+ hr.leaseTime,
hr.keep_pet as keepPet
from t_house_resource hr
left join t_app_user au on (hr.app_user_id = au.id)
left join t_region rc on (hr.district_id = rc.id)
left join t_region rp on (rp.id = rc.parent_id)
- where hr.is_delete = 0 and hr.`status` = 1 and hr.auth_status = 2
- and hr.type=2
- <if test="null != req.type">
+ where hr.is_delete = 0 and hr.`status` = 1 and hr.auth_status = 2 and hr.type=2
+ <if test="null != req.type and 2 == req.type">
and hr.data_type = #{req.type}
</if>
- <if test="null != req.userType and 4 != req.userType">
- and au.user_type = #{req.userType}
+ <if test="null != req.type and 1 == req.type">
+ and hr.data_type = #{req.type}
+ </if>
+ <if test="null != req.userType and 2 == req.userType">
+ and au.user_type = 2
+ </if>
+ <if test="null != req.userType and 3 == req.userType">
+ and au.user_type = 3
+ </if>
+ <if test="null == req.userType">
+ and hr.firm_house != 1
</if>
<if test="null != req.userType and 4 == req.userType">
and hr.firm_house = 1
</if>
<if test="null != req.content and '' != req.content">
- and hr.title = CONCAT('%', #{req.content}, '%')
+ and hr.title like CONCAT('%', #{req.content}, '%')
</if>
<if test="null != cityIds and cityIds.size()>0" >
- and hr.city_id in
+ and hr.district_id in
<foreach collection="cityIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="null != districtIds and districtIds.size()>0">
- and hr.district_id in
+ and hr.city_id in
<foreach collection="districtIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
@@ -100,52 +239,77 @@
and hr.good_house = 1
</if>
<if test="null != req.dataType and req.dataType == 2">
- and now() <= DATE_ADD(hr.insert_time,INTERVAL 7 day)
+ and now() <= DATE_ADD(hr.insert_time,INTERVAL 21 day)
</if>
+ order by au.user_type desc
<if test="null != req.sort and req.sort == 1">
- order by hr.insert_time desc
+ ,hr.insert_time desc
</if>
<if test="null != req.sort and req.sort == 2">
- order by hr.good_house desc
+ , hr.views_number desc
</if>
<if test="null != req.sort and req.sort == 3">
- order by hr.sale_amount
+ , hr.sale_amount
</if>
<if test="null != req.sort and req.sort == 4">
- order by hr.sale_amount desc
+ , hr.sale_amount desc
</if>
- limit #{req.pageNum}, #{req.pageSize}
</select>
-
-
<select id="searchHouseResourceCount" resultType="int">
select
- count(1)
+ hr.id,
+ au.user_type as houseResource,
+ hr.house_photo as imgUrl,
+ hr.title,
+ hr.house_area as houseArea,
+ hr.house_model as houseModel,
+ concat(rp.`name`, rc.`name`) as address,
+ hr.longitude,
+ hr.latitude,
+ hr.platform,
+ hr.sale_amount as saleAmount,
+ au.profile_photo as profilePhoto,
+ au.nickname,
+ hr.elevator,
+ hr.drying_area as dryingArea,
+ hr.garden,
+ hr.carport,
+ hr.air,
+ hr.balcony,
+ hr.leaseTime,
+ hr.keep_pet as keepPet
from t_house_resource hr
left join t_app_user au on (hr.app_user_id = au.id)
- where hr.is_delete = 0 and hr.`status` = 1 and hr.auth_status = 2
- and hr.type=2
+ left join t_region rc on (hr.district_id = rc.id)
+ left join t_region rp on (rp.id = rc.parent_id)
+ where hr.is_delete = 0 and hr.`status` = 1 and hr.auth_status = 2 and hr.type=2
<if test="null != req.type">
and hr.data_type = #{req.type}
</if>
- <if test="null != req.userType and 4 != req.userType">
+ <if test="null != req.userType and 2 == req.userType">
+ and hr.is_manage != 1
+ </if>
+ <if test="null != req.userType and 4 != req.userType and 5 != req.userType">
and au.user_type = #{req.userType}
</if>
<if test="null != req.userType and 4 == req.userType">
and hr.firm_house = 1
</if>
+ <if test="null != req.userType and 5 == req.userType">
+ and hr.firm_house = 0
+ </if>
<if test="null != req.content and '' != req.content">
- and hr.title = CONCAT('%', #{req.content}, '%')
+ and hr.title like CONCAT('%', #{req.content}, '%')
</if>
<if test="null != cityIds and cityIds.size()>0" >
- and hr.city_id in
+ and hr.district_id in
<foreach collection="cityIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="null != districtIds and districtIds.size()>0">
- and hr.district_id in
+ and hr.city_id in
<foreach collection="districtIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
@@ -196,7 +360,35 @@
and hr.good_house = 1
</if>
<if test="null != req.dataType and req.dataType == 2">
- and now() <= DATE_ADD(hr.insert_time,INTERVAL 7 day)
+ order by hr.insert_time desc
+ <if test="null != req.sort and req.sort == 1">
+ , hr.insert_time desc
+ </if>
+ <if test="null != req.sort and req.sort == 2">
+ , hr.good_house desc
+ </if>
+ <if test="null != req.sort and req.sort == 3">
+ ,hr.sale_amount
+ </if>
+ <if test="null != req.sort and req.sort == 4">
+ , hr.sale_amount desc
+ </if>
+ ,hr.insert_time desc, au.user_type desc
+ </if>
+ <if test="null == req.dataType">
+ order by au.user_type desc, hr.insert_time desc
+ <if test="null != req.sort and req.sort == 1">
+ , hr.insert_time desc
+ </if>
+ <if test="null != req.sort and req.sort == 2">
+ , hr.good_house desc
+ </if>
+ <if test="null != req.sort and req.sort == 3">
+ ,hr.sale_amount
+ </if>
+ <if test="null != req.sort and req.sort == 4">
+ , hr.sale_amount desc
+ </if>
</if>
</select>
@@ -218,8 +410,11 @@
left join t_app_user au on (hr.app_user_id = au.id)
where hr.is_delete = 0 and hr.`status` = 1 and hr.auth_status = 2
and hr.type=2
- <if test="null != userType and 4 != userType">
- and au.user_type = #{userType} and au.status = 1 and au.audit_status = 2
+ <if test="null != userType and 2 == userType">
+ and au.user_type = 2
+ </if>
+ <if test="null != userType and 3 == userType">
+ and au.user_type = 3
</if>
<if test="null != userType and 4 == userType">
and hr.firm_house = 1
@@ -263,11 +458,14 @@
hr.id,
hr.title,
hr.sale_amount as saleAmount,
- hr.elevator,
+ hr.elevator as elevator,
+ hr.house_model as houseModel,
+ hr.house_type_id as houseTypeId,
hr.drying_area as dryingArea,
- hr.garden,
- hr.carport,
- hr.balcony,
+ hr.garden as garden,
+ hr.carport as carport,
+ hr.balcony as balcony,
+ hr.app_user_id as appuserId,
hr.city_id as cityId,
hr.district_id as districtId,
hr.keep_pet as keepPet,
@@ -275,17 +473,17 @@
hr.code as code,
hr.leaseTime as leaseTime,
hr.data_type as dataType,
- hr.insert_time as insertTime,hr.type as `type`,
+ hr.insert_time as insertTime,
+ hr.auth_status as authStatus,
+ hr.type as `type`,
+ hr.upTime as upTime,
+ tp.name as houseTypeName,
+ 2 as `data`,
hr.status as status
from t_house_resource hr
- left join t_collection_house_resource t1 on hr.id = t1.house_resource_id
- where hr.is_delete = 0 and hr.`status` = 1 and hr.auth_status = 2
- <if test="null != ids and ids.size()>0">
- and hr.id in
- <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </if>
+ left join t_house_type tp on hr.house_type_id = tp.id
+ where hr.is_delete = 0
+ and hr.app_user_id = #{id}
</select>
<select id="release" resultType="com.stylefeng.guns.modular.system.warpper.res.CollectListRes">
select
@@ -309,13 +507,15 @@
hr.house_video as houseVideo,
hr.insert_time as insertTime,hr.type as `type`,
hr.status as status,
+ 2 as `data`,
+ tp.name as houseTypeName,
au.profile_photo as profilePhoto,
au.nickname as nickname,
au.user_type as userType
from t_house_resource hr
- left join t_collection_house_resource t1 on hr.id = t1.house_resource_id
left join t_app_user au on hr.app_user_id = au.id
- where hr.is_delete = 0 and hr.`status` = 1 and hr.auth_status = 2
+ left join t_house_type tp on hr.house_type_id = tp.id
+ where hr.is_delete = 0 and hr.`status` = 1
<if test="null != ids and ids.size()>0">
and hr.id in
<foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
@@ -323,6 +523,4 @@
</foreach>
</if>
</select>
-
-
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1