Merge branch 'dev' into 'main'

Dev

See merge request !46

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

@@ -14,11 +14,13 @@ public class HouseResourcePage {
 
     private String two;
 
+    private String wgName2;
+
     private String three;
 
     private String four;
 
-    private String wgName;
+    private String wgName4;
 
     private int type;
 

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

 package com.ruoyi.system.domain.house.vo;
 
 import com.ruoyi.common.core.page.PageDomain;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -18,5 +19,9 @@ public class HouseResourcePageQuery extends PageDomain {
 
     private String sortWay;
 
-    private int wgType;
+    private Integer wgType;
+
+    private Integer hireStatus;
+
+    private String houseNumber;
 }

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

@@ -2,12 +2,15 @@ package com.ruoyi.system.service.house.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.system.domain.grid.GridRegion;
+import com.ruoyi.system.domain.grid.GridRegionExample;
 import com.ruoyi.system.domain.house.HouseResource;
 import com.ruoyi.system.domain.house.HouseResourceAssociationObject;
 import com.ruoyi.system.domain.house.enums.HouseEnums;
 import com.ruoyi.system.domain.house.vo.HouseResourcePage;
 import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
 import com.ruoyi.system.domain.house.vo.HouseResourceSaveUpdateDto;
+import com.ruoyi.system.mapper.grid.GridRegionMapper;
 import com.ruoyi.system.mapper.house.HouseResourceAssociationObjectMapper;
 import com.ruoyi.system.mapper.house.HouseResourceMapper;
 import com.ruoyi.system.service.house.HouseResourceService;
@@ -24,9 +27,12 @@ public class HouseResourceServiceImpl implements HouseResourceService {
 
     private final HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper;
 
-    public HouseResourceServiceImpl(HouseResourceMapper houseResourceMapper, HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper) {
+    private final GridRegionMapper gridRegionMapper;
+
+    public HouseResourceServiceImpl(HouseResourceMapper houseResourceMapper, HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper, GridRegionMapper gridRegionMapper) {
         this.houseResourceMapper = houseResourceMapper;
         this.houseResourceAssociationObjectMapper = houseResourceAssociationObjectMapper;
+        this.gridRegionMapper = gridRegionMapper;
     }
 
     @Override
@@ -85,6 +91,12 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     public IPage<HouseResourcePage> pageHouseResources(HouseResourcePageQuery query) {
         IPage<HouseResourcePage> page = houseResourceMapper.selectPage(new Page<>(query.getPageNum(), query.getPageSize()), query);
         page.getRecords().forEach(x -> {
+            GridRegionExample gridRegionExample = new GridRegionExample();
+            gridRegionExample.createCriteria().andWgCodeEqualTo(x.getTwo()).andWgTypeEqualTo(String.valueOf(x.getType()));
+            List<GridRegion> two = gridRegionMapper.selectByExample(gridRegionExample);
+            if (!two.isEmpty()) {
+                x.setWgName2(two.get(0).getWgName());
+            }
             if (StringUtils.hasText(x.getHouseResourceUrl())) {
                 x.setHouseResourceUrlList(Arrays.asList(x.getHouseResourceUrl().split(",")));
             }

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

@@ -106,7 +106,7 @@
 
     <select id="selectPage" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
         SELECT
-        t1.wg_name AS wgName,
+        t1.wg_name AS wgName4,
         t2.*
         FROM
         grid_region t1
@@ -127,6 +127,12 @@
             <if test="query.houseResourceAttribute != null and query.houseResourceAttribute != ''">
                 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>