Merge branch 'dev' into 'main'

Dev

See merge request !121

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceController.java

@@ -49,8 +49,12 @@ public class HouseResourceController {
     }
 
     @GetMapping("/page")
-    public AjaxResult pageHouseResources(HouseResourcePageQuery query) {
+    public AjaxResult getPageHouseResources(HouseResourcePageQuery query) {
         return AjaxResult.success(houseResourceService.pageHouseResources(query));
     }
 
+    @GetMapping("/list")
+    public AjaxResult getListHouseResources(HouseResourcePageQuery query) {
+        return AjaxResult.success(houseResourceService.listHouseResources(query));
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/house/HouseResourceMapper.java

@@ -21,4 +21,6 @@ public interface HouseResourceMapper {
     void batchInsertHouseResources(List<HouseResource> houseResources);
 
     IPage<HouseResourcePage> selectPage(IPage<HouseResource> page, @Param("query") HouseResourcePageQuery houseResourcePageQuery);
+
+    List<HouseResourcePage> selectList(@Param("query") HouseResourcePageQuery houseResourcePageQuery);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/HouseResourceService.java

@@ -22,4 +22,6 @@ public interface HouseResourceService {
     void batchSaveHouseResources(List<HouseResource> houseResources);
 
     IPage<HouseResourcePage> pageHouseResources(HouseResourcePageQuery query);
+
+    List<HouseResourcePage> listHouseResources(HouseResourcePageQuery query);
 }

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

@@ -150,7 +150,19 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     @Override
     public IPage<HouseResourcePage> pageHouseResources(HouseResourcePageQuery query) {
         IPage<HouseResourcePage> page = houseResourceMapper.selectPage(new Page<>(query.getPageNum(), query.getPageSize()), query);
-        page.getRecords().forEach(x -> {
+        List<HouseResourcePage> records = handleHouseList(page.getRecords());
+        page.setRecords(records);
+        return page;
+    }
+
+    @Override
+    public List<HouseResourcePage> listHouseResources(HouseResourcePageQuery query) {
+        List<HouseResourcePage> list = houseResourceMapper.selectList(query);
+        return handleHouseList(list);
+    }
+
+    private List<HouseResourcePage> handleHouseList(List<HouseResourcePage> list) {
+        list.forEach(x -> {
             GridRegionExample gridRegionExample = new GridRegionExample();
             gridRegionExample.createCriteria().andWgCodeEqualTo(x.getTwo()).andWgTypeEqualTo(String.valueOf(x.getType()));
             List<GridRegion> two = gridRegionMapper.selectByExample(gridRegionExample);
@@ -175,6 +187,6 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                 x.setBusinessEntityInfoNames(businessEntityInfos.stream().map(BusinessEntityInfo::getName).collect(Collectors.toList()));
             }
         });
-        return page;
+        return list;
     }
 }

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

@@ -144,4 +144,38 @@
             </if>
         </where>
     </select>
+    <select id="selectList" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
+        SELECT
+        t1.wg_name AS wgName4,
+        t2.*
+        FROM
+        grid_region t1
+        LEFT JOIN house_resource t2 ON t1.wg_code = t2.four
+        <where>
+            <if test="query.wgType != null">
+                and t2.type = #{query.wgType}
+            </if>
+            <if test="query.two != null and query.two != ''">
+                and t2.two = #{query.two}
+            </if>
+            <if test="query.three != null and query.three != ''">
+                and t2.three = #{query.three}
+            </if>
+            <if test="query.four != null and query.four != ''">
+                and t2.four = #{query.four}
+            </if>
+            <if test="query.houseResourceAttribute != null">
+                and t2.house_resource_attribute = #{query.houseResourceAttribute}
+            </if>
+            <if test="query.hireStatus != null">
+                and t2.hire_status = #{query.hireStatus}
+            </if>
+            <if test="query.houseNumber != null and query.houseNumber != ''">
+                and t2.house_number like concat('%', #{query.houseNumber}, '%')
+            </if>
+            <if test="query.sortWay != null and query.sortWay != ''">
+                order by t2.houseArea ${query.sortWay}
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file