feat: 房源

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

@@ -9,21 +9,25 @@ import java.util.List;
 @Data
 public class HouseResourceExport {
 
-    @Excel(name = "二级网格")
+    @Excel(name = "所属社区")
     private String wgName2;
 
-    @Excel(name = "三级网格")
+    @Excel(name = "所属经营主体")
     private String wgName3;
 
-    @Excel(name = "四级网格")
+    @Excel(name = "所属门牌号")
     private String wgName4;
 
     @Excel(name = "类型", readConverterExp = "1=楼宇,4=道路,5=街区,6=综合体,7=市场")
     private int type;
 
+    @Excel(name = "经营主体性质")
+    private String nature;
+
+    @Excel(name = "经营主体名称")
     private List<String> businessEntityInfoNames;
 
-    @Excel(name = "所属门牌号")
+    @Excel(name = "门面号")
     private String houseNumber;
 
     private int houseResourceType;
@@ -60,8 +64,8 @@ public class HouseResourceExport {
     @Excel(name = "工作人员数量")
     private Integer workerNumber;
 
-    @Excel(name = "性质")
-    private String nature;
+    @Excel(name = "注册地是否宜城街道", readConverterExp = "0=否,1=是")
+    private Integer registrationPlaceFlag;
 
     @Excel(name = "注册地址")
     private String registeredAddress;

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

@@ -277,7 +277,8 @@
         SELECT
         t2.wg_name AS wgName4,
         t1.*,
-        t4.year_sell
+        t3.*,
+        t4.*
         FROM
         house_resource t1
         LEFT JOIN grid_region t2 ON t2.wg_code = t1.four