feat: 房源

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

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

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

@@ -112,6 +112,10 @@ public class HouseResourcePage {
 
     private Boolean registrationPlaceFlag;
 
+    private String businessEntityInfoName;
+
+    private String principal;
+
     private String principalTel;
 
     private String business;

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

@@ -77,4 +77,6 @@ public class HouseResourcePageQuery extends PageDomain {
     private String incomeSort;
 
     private Integer year;
+
+    private Integer registrationPlaceFlag;
 }

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

@@ -178,6 +178,9 @@
             <if test="query.year != null">
                 and t4.`year` = #{query.year}
             </if>
+            <if test="query.registrationPlaceFlag != null">
+                and t3.registration_place_flag = #{query.registrationPlaceFlag}
+            </if>
             <if test="query.wgCodes != null and query.wgCodes.size() > 0">
                 and t1.two in
                 <foreach item="item" index="index" collection="query.wgCodes" open="(" separator="," close=")">
@@ -295,11 +298,12 @@
         t3.registered_address,
         t3.industry_classification,
         t3.gs,
-        t1.remark
+        t1.remark,
+        t3.name AS businessEntityInfoName
         FROM
         house_resource t1
         LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
-        LEFT JOIN business_entity_info t3 ON t1.id = t3.house_resource_id
+        LEFT JOIN business_entity_info t3 ON t1.id = t3.house_resource_id limit 0, 100
         <where>
             <if test="query.wgType != null">
                 and t1.type = #{query.wgType}
@@ -328,16 +332,13 @@
                     #{item}
                 </foreach>
             </if>
-        </where>
-        GROUP BY t1.id
-        <trim prefix="having" prefixOverrides="and">
             <if test="query.houseAreaMin != null and query.houseAreaMin != '' and query.houseAreaMax != null and query.houseAreaMax != ''">
                 and t1.house_area <![CDATA[ >= ]]> #{query.houseAreaMin} and t1.house_area <![CDATA[ <= ]]> #{query.houseAreaMax}
             </if>
             <if test="query.yearSellMin != null and query.yearSellMin != '' and query.yearSellMax != null and query.yearSellMax != ''">
                 and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
-        </trim>
+        </where>
     </select>
     <select id="selectAll" resultType="com.ruoyi.system.domain.house.HouseResource">
         SELECT * FROM house_resource