feat: 房源

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

@@ -105,4 +105,6 @@ public class HouseResourcePage {
     private String industryClassification;
 
     private Boolean gs;
+
+    private BigDecimal dayPrice;
 }

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

@@ -57,4 +57,8 @@ public class HouseResourcePageQuery extends PageDomain {
     private boolean zyzyFlag;
 
     private String fourOrHouseNumber;
+
+    private BigDecimal dayPriceMin;
+
+    private BigDecimal dayPriceMax;
 }

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

@@ -114,19 +114,25 @@
         </foreach>
     </insert>
 
-    <select id="selectPage" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
+    <resultMap id="pageResultMap" type="com.ruoyi.system.domain.house.vo.HouseResourcePage">
+        <result column="dayPrice" property="dayPrice" javaType="java.math.BigDecimal"/>
+        <result column="income" property="income" javaType="java.math.BigDecimal"/>
+    </resultMap>
+
+    <select id="selectPage" resultMap="pageResultMap">
         SELECT
         t2.wg_name AS wgName4,
         t1.*,
         SUM(t4.year_sell) AS income,
         t3.nature,
-        t3.industry_classification
+        t3.industry_classification,
+        ROUND(t1.unit_price * 10000 / 365 / t1.house_area, 1) AS dayPrice
         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>
+        where t1.rental_unit = 5 and t1.unit_price is not null
         <if test="query.wgType != null">
             and t1.type = #{query.wgType}
         </if>
@@ -166,8 +172,10 @@
                 #{item}
             </foreach>
         </if>
-        </where>
         GROUP BY t1.id
+        <if test="query.dayPriceMin != null and query.dayPriceMin != '' and query.dayPriceMax != null and query.dayPriceMax != ''">
+            having dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin} and dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax}
+        </if>
     </select>
     <select id="selectProfileGraph" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
         SELECT