feat: 房源

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourcePageQuery.java

@@ -5,6 +5,8 @@ import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class HouseResourcePageQuery extends PageDomain {
@@ -24,4 +26,14 @@ public class HouseResourcePageQuery extends PageDomain {
     private Integer hireStatus;
 
     private String houseNumber;
+
+    private BigDecimal houseAreaMin;
+
+    private BigDecimal houseAreaMax;
+
+    private Integer houseResourceType;
+
+    private BigDecimal yearSellMin;
+
+    private BigDecimal yearSellMax;
 }

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

@@ -117,10 +117,13 @@
     <select id="selectPage" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
         SELECT
         t2.wg_name AS wgName4,
-        t1.*
+        t1.*,
+        t4.year_sell
         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}
@@ -143,6 +146,15 @@
             <if test="query.houseNumber != null and query.houseNumber != ''">
                 and t1.house_number like concat('%', #{query.houseNumber}, '%')
             </if>
+            <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.houseResourceType != null">
+                and t1.house_resource_type = #{query.houseResourceType}
+            </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>
         <if test="query.sortWay != null and query.sortWay != ''">
             order by t1.house_area ${query.sortWay}
@@ -217,4 +229,4 @@
     <select id="selectAll" resultType="com.ruoyi.system.domain.house.HouseResource">
         SELECT * FROM house_resource
     </select>
-</mapper>
+</mapper>
\ No newline at end of file