Merge branch 'dev-lx' into dev

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/HouseResource.java

@@ -38,6 +38,8 @@ public class HouseResource implements Serializable {
 
     private String houseResourceEquity;
 
+    private String businessStatus;
+
     private String houseResourceEquityTel;
 
     private String ownership;

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

@@ -52,6 +52,8 @@ public class HouseResourceDetail {
 
     private String houseResourceEquity;
 
+    private String businessStatus;
+
     private String houseResourceEquityTel;
 
     private String ownership;

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

@@ -50,6 +50,8 @@ public class HouseResourcePage {
 
     private String houseResourceEquity;
 
+    private String businessStatus;
+
     private String houseResourceEquityTel;
 
     private String ownership;

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

@@ -17,6 +17,7 @@
         <result property="houseResourceType" column="house_resource_type" jdbcType="INTEGER"/>
         <result property="houseResourceUse" column="house_resource_use" jdbcType="VARCHAR"/>
         <result property="houseResourceEquity" column="house_resource_equity" jdbcType="VARCHAR"/>
+        <result property="businessStatus" column="business_status" jdbcType="VARCHAR" />
         <result property="houseResourceEquityTel" column="house_resource_equity_tel" jdbcType="VARCHAR"/>
         <result property="ownership" column="ownership" jdbcType="VARCHAR" />
         <result property="decorationCondition" column="decoration_condition" jdbcType="INTEGER"/>
@@ -41,12 +42,12 @@
     <insert id="insertHouseResource" parameterType="com.ruoyi.system.domain.house.HouseResource">
         INSERT INTO house_resource
         (id, relation_id, two, three, four, type, project_id, house_resource_url, business_license_url, house_number, house_area,
-         house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, house_resource_equity_tel, ownership,
+         house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, business_status, house_resource_equity_tel, ownership,
          decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
          meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, lon, lat, remark)
         VALUES
             (#{id}, #{relationId}, #{two}, #{three}, #{four}, #{type}, #{projectId}, #{houseResourceUrl}, #{businessLicenseUrl}, #{houseNumber}, #{houseArea},
-             #{houseResourceAttribute}, #{houseResourceType}, #{houseResourceUse}, #{houseResourceEquity}, #{houseResourceEquityTel}, #{ownership},
+             #{houseResourceAttribute}, #{houseResourceType}, #{houseResourceUse}, #{houseResourceEquity}, #{businessStatus}, #{houseResourceEquityTel}, #{ownership},
              #{decorationCondition}, #{orientation}, #{landingHeadFlag}, #{commonAreaNumber}, #{officeNumber},
              #{meetingNumber}, #{stationNumber}, #{setUp}, #{labelId}, #{unitPrice}, #{rentalUnit}, #{planeGraphUrl}, #{hireStatus}, #{address}, #{lon}, #{lat}, #{remark})
     </insert>
@@ -71,6 +72,7 @@
             house_resource_type = #{houseResourceType},
             house_resource_use = #{houseResourceUse},
             house_resource_equity = #{houseResourceEquity},
+            business_status = #{businessStatus},
             house_resource_equity_tel = #{houseResourceEquityTel},
             ownership = #{ownership},
             decoration_condition = #{decorationCondition},
@@ -100,14 +102,14 @@
     <insert id="batchInsertHouseResources" parameterType="java.util.List">
         INSERT INTO house_resource
         (id, relation_id, two, three, four, type, project_id, house_resource_url, business_license_url, house_number, house_area,
-        house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, house_resource_equity_tel, ownership,
+        house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, business_status, house_resource_equity_tel, ownership,
         decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
         meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, lon, lat, remark)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.id}, #{item.relationId},  #{two}, #{three}, #{four}, #{item.type}, #{item.projectId}, #{item.houseResourceUrl}, #{item.businessLicenseUrl},
             #{item.houseNumber}, #{item.houseArea}, #{item.houseResourceAttribute}, #{item.houseResourceType},
-            #{item.houseResourceUse}, #{item.houseResourceEquity}, #{item.houseResourceEquityTel}, #{ownership}, #{item.decorationCondition},
+            #{item.houseResourceUse}, #{item.houseResourceEquity}, #{businessStatus}, #{item.houseResourceEquityTel}, #{ownership}, #{item.decorationCondition},
             #{item.orientation}, #{item.landingHeadFlag}, #{item.commonAreaNumber}, #{item.officeNumber},
             #{item.meetingNumber}, #{item.stationNumber}, #{item.setUp}, #{item.labelId}, #{item.unitPrice}, #{item.rentalUnit},
             #{item.planeGraphUrl}, #{item.hireStatus}, #{item.address}, #{item.lon}, #{item.lat}, #{item.remark})