feat: 房源

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

@@ -6,7 +6,7 @@ import com.ruoyi.system.domain.house.HouseResource;
 import com.ruoyi.system.domain.house.vo.*;
 import com.ruoyi.system.service.house.HouseResourceService;
 import org.springframework.beans.BeanUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -102,6 +102,9 @@ public class HouseResourceController {
         pageList.forEach(x -> {
             HouseResourceExport houseResourceExport = new HouseResourceExport();
             BeanUtils.copyProperties(x, houseResourceExport);
+            if (!CollectionUtils.isEmpty(x.getBusinessEntityInfoNames())) {
+                houseResourceExport.setBusinessEntityInfoNamesStr(String.join(",", x.getBusinessEntityInfoNames()));
+            }
             exportList.add(houseResourceExport);
         });
         ExcelUtil<HouseResourceExport> util = new ExcelUtil<>(HouseResourceExport.class);

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

@@ -48,9 +48,11 @@ public class HouseResourceExport {
     @Excel(name = "经营主体性质", readConverterExp = "1=个体经营户,2=法人单位（企业）,3=分公司,4=非经营主体")
     private String nature;
 
-    @Excel(name = "经营主体名称")
     private List<String> businessEntityInfoNames;
 
+    @Excel(name = "经营主体名称")
+    private String businessEntityInfoNamesStr;
+
     @Excel(name = "负责人联系方式")
     private String principalTel;
 

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

@@ -307,7 +307,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         } else {
-            return handleHouseList(list, true);
+            return handleHouseList(list, false);
         }
     }
 

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

@@ -273,6 +273,7 @@
     </select>
     <select id="exportList" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
         SELECT
+        t1.id,
         t1.two,
         t1.three,
         t2.wg_name AS wgName4,