feat: 房源

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -183,9 +183,10 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
     private List<HouseResourcePage> handleHouseList(List<HouseResourcePage> list) {
         list.forEach(x -> {
-            GridRegion two = gridRegionMapper.selectByPrimaryKey(x.getTwo());
-            x.setWgName2(two.getWgName());
-
+            String wgNameByCode = gridRegionMapper.getWgNameByCode(x.getTwo());
+            if (StringUtils.hasText(wgNameByCode)) {
+                x.setWgName2(wgNameByCode);
+            }
             GridRegion three = gridRegionMapper.selectByPrimaryKey(x.getThree());
             x.setWgName3(three.getWgName());
             x.setHouseResourceAttributeText(HouseEnums.HouseResourceAttributeEnum.getDescByCode(x.getHouseResourceAttribute()));

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

@@ -112,35 +112,35 @@
 
     <select id="selectPage" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
         SELECT
-        t1.wg_name AS wgName4,
-        t2.*
+        t2.wg_name AS wgName4,
+        t1.*
         FROM
-        grid_region t1
-        LEFT JOIN house_resource t2 ON t1.id = t2.four
+        house_resource t1
+        LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
         <where>
             <if test="query.wgType != null">
-                and t2.type = #{query.wgType}
+                and t1.type = #{query.wgType}
             </if>
             <if test="query.two != null and query.two != ''">
-                and t2.two = #{query.two}
+                and t1.two = #{query.two}
             </if>
             <if test="query.three != null and query.three != ''">
-                and t2.three = #{query.three}
+                and t1.three = #{query.three}
             </if>
             <if test="query.four != null and query.four != ''">
-                and t2.four = #{query.four}
+                and t1.four = #{query.four}
             </if>
             <if test="query.houseResourceAttribute != null">
-                and t2.house_resource_attribute = #{query.houseResourceAttribute}
+                and t1.house_resource_attribute = #{query.houseResourceAttribute}
             </if>
             <if test="query.hireStatus != null">
-                and t2.hire_status = #{query.hireStatus}
+                and t1.hire_status = #{query.hireStatus}
             </if>
             <if test="query.houseNumber != null and query.houseNumber != ''">
-                and t2.house_number like concat('%', #{query.houseNumber}, '%')
+                and t1.house_number like concat('%', #{query.houseNumber}, '%')
             </if>
             <if test="query.sortWay != null and query.sortWay != ''">
-                order by t2.house_area ${query.sortWay}
+                order by t1.house_area ${query.sortWay}
             </if>
         </where>
     </select>
@@ -150,7 +150,7 @@
         t1.*
         FROM
         house_resource t1
-        LEFT JOIN grid_region t2 ON t1.four = t2.id
+        LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
         <where>
             <if test="query.wgType != null">
                 and t1.type = #{query.wgType}
@@ -173,39 +173,40 @@
             <if test="query.houseNumber != null and query.houseNumber != ''">
                 and t1.house_number like concat('%', #{query.houseNumber}, '%')
             </if>
+                order by t1.four DESC
         </where>
     </select>
     <select id="selectList" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
         SELECT
-        t1.wg_name AS wgName4,
-        t2.*
+        t2.wg_name AS wgName4,
+        t1.*
         FROM
-        grid_region t1
-        LEFT JOIN house_resource t2 ON t1.id = t2.four
+        house_resource t1
+        LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
         <where>
             <if test="query.wgType != null">
-                and t2.type = #{query.wgType}
+                and t1.type = #{query.wgType}
             </if>
             <if test="query.two != null and query.two != ''">
-                and t2.two = #{query.two}
+                and t1.two = #{query.two}
             </if>
             <if test="query.three != null and query.three != ''">
-                and t2.three = #{query.three}
+                and t1.three = #{query.three}
             </if>
             <if test="query.four != null and query.four != ''">
-                and t2.four = #{query.four}
+                and t1.four = #{query.four}
             </if>
             <if test="query.houseResourceAttribute != null">
-                and t2.house_resource_attribute = #{query.houseResourceAttribute}
+                and t1.house_resource_attribute = #{query.houseResourceAttribute}
             </if>
             <if test="query.hireStatus != null">
-                and t2.hire_status = #{query.hireStatus}
+                and t1.hire_status = #{query.hireStatus}
             </if>
             <if test="query.houseNumber != null and query.houseNumber != ''">
-                and t2.house_number like concat('%', #{query.houseNumber}, '%')
+                and t1.house_number like concat('%', #{query.houseNumber}, '%')
             </if>
             <if test="query.sortWay != null and query.sortWay != ''">
-                order by t2.house_area ${query.sortWay}
+                order by t1.house_area ${query.sortWay}
             </if>
         </where>
     </select>