feat: 房源

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

@@ -21,39 +21,35 @@ public class HouseResourceExport {
     @Excel(name = "类型", readConverterExp = "1=楼宇,4=道路,5=街区,6=综合体,7=市场")
     private int type;
 
-    @Excel(name = "经营主体性质")
-    private String nature;
-
-    @Excel(name = "经营主体名称")
-    private List<String> businessEntityInfoNames;
-
     @Excel(name = "门面号")
     private String houseNumber;
 
-    private int houseResourceType;
-
-    @Excel(name = "房源类型")
-    private String houseResourceTypeText;
+    @Excel(name = "具体位置")
+    private String address;
 
-    @Excel(name = "房源面积")
+    @Excel(name = "场所面积")
     private BigDecimal houseArea;
 
-    private int houseResourceAttribute;
-
-    @Excel(name = "房源属性")
+    @Excel(name = "产权类型")
     private String houseResourceAttributeText;
 
-    @Excel(name = "产权人联系方式")
-    private String houseResourceEquityTel;
+    @Excel(name = "经营（办公）场所状态")
+    private String houseResourceTypeText;
 
     @Excel(name = "产权人归属")
     private String ownership;
 
-    @Excel(name = "地址")
-    private String address;
+    @Excel(name = "产权人联系方式")
+    private String houseResourceEquityTel;
 
-    @Excel(name = "负责人")
-    private String principal;
+    @Excel(name = "租金")
+    private BigDecimal unitPrice;
+
+    @Excel(name = "经营主体性质", readConverterExp = "1=个体经营户,2=法人单位（企业）,3=分公司,4=非经营主体")
+    private String nature;
+
+    @Excel(name = "经营主体名称")
+    private List<String> businessEntityInfoNames;
 
     @Excel(name = "负责人联系方式")
     private String principalTel;

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

@@ -273,15 +273,32 @@
     </select>
     <select id="exportList" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
         SELECT
+        t1.two,
+        t1.three,
         t2.wg_name AS wgName4,
-        t1.*,
-        t3.*,
-        t4.*
+        t1.type,
+        t1.house_number,
+        t1.address,
+        t1.house_area,
+        t1.house_resource_attribute,
+        t1.house_resource_type,
+        t1.ownership,
+        t1.house_resource_equity_tel,
+        t1.unit_price,
+        t3.nature,
+        t3.NAME,
+        t3.principal_tel,
+        t3.business,
+        t3.worker_number,
+        t3.registration_place_flag,
+        t3.registered_address,
+        t3.industry_classification,
+        t3.gs,
+        t1.remark
         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_sell t4 ON t4.business_entity_info_id = t3.id
         <where>
             <if test="query.wgType != null">
                 and t1.type = #{query.wgType}