feat: 房源

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -222,6 +222,8 @@
         FROM
         house_resource t1
         LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
+        LEFT JOIN business_entity_info t3 ON t1.id = t3.house_resource_id
+        LEFT JOIN business_entity_sell t4 ON t4.business_entity_info_id = t3.id
         <where>
             <if test="query.wgType != null">
                 and t1.type = #{query.wgType}
@@ -247,6 +249,14 @@
             <if test="query.sortWay != null and query.sortWay != ''">
                 order by t1.house_area ${query.sortWay}
             </if>
+            GROUP BY t1.id
+            <trim prefix="having" prefixOverrides="and"></trim>
+            <if test="query.houseAreaMin != null and query.houseAreaMin != '' and query.houseAreaMax != null and query.houseAreaMax != ''">
+                and t1.house_area <![CDATA[ >= ]]> #{query.houseAreaMin} and t1.house_area <![CDATA[ <= ]]> #{query.houseAreaMax}
+            </if>
+            <if test="query.yearSellMin != null and query.yearSellMin != '' and query.yearSellMax != null and query.yearSellMax != ''">
+                and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
+            </if>
         </where>
     </select>
     <select id="selectAll" resultType="com.ruoyi.system.domain.house.HouseResource">