feat: 房源

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

@@ -114,6 +114,8 @@ public class HouseResourcePage {
 
     private String businessEntityInfoName;
 
+    private String name;
+
     private String principal;
 
     private String principalTel;

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

@@ -28,9 +28,9 @@ public class HouseResourcePageQuery extends PageDomain {
 
     private String houseNumber;
 
-    private BigDecimal houseAreaMin = BigDecimal.ZERO;
+    private BigDecimal houseAreaMin;
 
-    private BigDecimal houseAreaMax = new BigDecimal(9999999);
+    private BigDecimal houseAreaMax;
 
     private Integer houseResourceType;
 

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

@@ -129,6 +129,7 @@
         t3.nature,
         t3.industry_classification,
         ROUND(IFNULL(t1.unit_price,0) * 10000 / 365 / t1.house_area, 1) AS dayPrice,
+        t3.name,
         t4.year
         FROM
         house_resource t1
@@ -235,7 +236,7 @@
                 )
             </if>
         </where>
-        GROUP BY t1.id
+        GROUP BY t1.id, t3.id
         <trim prefix="having" prefixOverrides="and">
             <if test="query.dayPriceMin != null and query.dayPriceMin != ''">
                 and dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}
@@ -398,7 +399,7 @@
                 )
             </if>
         </where>
-        GROUP BY t1.id
+        GROUP BY t1.id, t3.id
         <trim prefix="having" prefixOverrides="and">
             <if test="query.dayPriceMin != null and query.dayPriceMin != ''">
                 and dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}
@@ -519,6 +520,7 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY t1.id, t3.id
         <trim prefix="having" prefixOverrides="and">
             <if test="query.dayPriceMin != null and query.dayPriceMin != ''">
                 and dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}