Merge branch 'dev-lx'

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

@@ -28,4 +28,6 @@ public class BusinessEntityInfo implements Serializable {
     private String registeredAddress;
 
     private String industryClassification;
+
+    private Boolean gs;
 }

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

@@ -75,6 +75,4 @@ public class HouseResource implements Serializable {
     private String lat;
 
     private String remark;
-
-    private Boolean gs;
 }

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

@@ -30,5 +30,7 @@ public class BusinessEntityDto {
 
     private String industryClassification;
 
+    private Boolean gs;
+
     private List<BusinessEntitySell> businessEntitySells;
 }

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

@@ -99,6 +99,4 @@ public class HouseResourceDetail {
     private String remark;
 
     private List<BusinessEntityDto> businessEntityDtoList;
-
-    private Boolean gs;
 }

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

@@ -13,15 +13,16 @@
         <result column="worker_number" property="workerNumber" jdbcType="INTEGER"/>
         <result column="registered_address" property="registeredAddress" jdbcType="VARCHAR"/>
         <result column="industry_classification" property="industryClassification" jdbcType="VARCHAR"/>
+        <result property="gs" column="gs" jdbcType="BIT"/>
     </resultMap>
 
     <insert id="insertBusinessEntityInfo" parameterType="com.ruoyi.system.domain.house.BusinessEntityInfo">
         INSERT INTO business_entity_info (
             id, house_resource_id, name, nature, social_credit_code,
-            principal, principal_tel, business, worker_number, registered_address, industry_classification
+            principal, principal_tel, business, worker_number, registered_address, industry_classification, gs
         ) VALUES (
                      #{id}, #{houseResourceId}, #{name}, #{nature}, #{socialCreditCode},
-                     #{principal}, #{principalTel}, #{business}, #{workerNumber}, #{registeredAddress}, #{industryClassification}
+                     #{principal}, #{principalTel}, #{business}, #{workerNumber}, #{registeredAddress}, #{industryClassification}, #{gs}
                  )
     </insert>
 
@@ -42,6 +43,7 @@
             <if test="workerNumber != null">worker_number=#{workerNumber},</if>
             <if test="registeredAddress != null">registered_address=#{registeredAddress},</if>
             <if test="industryClassification != null">industry_classification=#{industryClassification},</if>
+            <if test="gs != null">gs=#{gs},</if>
         </set>
         WHERE id=#{id}
     </update>

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

@@ -36,7 +36,6 @@
         <result property="lon" column="lon" jdbcType="VARCHAR"/>
         <result property="lat" column="lat" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
-        <result property="gs" column="gs" jdbcType="BIT"/>
     </resultMap>
 
     <insert id="insertHouseResource" parameterType="com.ruoyi.system.domain.house.HouseResource">
@@ -44,12 +43,12 @@
         (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,
          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, gs)
+         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},
              #{decorationCondition}, #{orientation}, #{landingHeadFlag}, #{commonAreaNumber}, #{officeNumber},
-             #{meetingNumber}, #{stationNumber}, #{setUp}, #{labelId}, #{unitPrice}, #{rentalUnit}, #{planeGraphUrl}, #{hireStatus}, #{address}, #{lon}, #{lat}, #{remark}, #{gs})
+             #{meetingNumber}, #{stationNumber}, #{setUp}, #{labelId}, #{unitPrice}, #{rentalUnit}, #{planeGraphUrl}, #{hireStatus}, #{address}, #{lon}, #{lat}, #{remark})
     </insert>
 
     <select id="selectHouseResourceById" resultType="com.ruoyi.system.domain.house.HouseResource" parameterType="string">
@@ -90,8 +89,7 @@
             address = #{address},
             lon = #{lon},
             lat = #{lat},
-            remark = #{remark},
-            gs = #{gs}
+            remark = #{remark}
         WHERE id = #{id}
     </update>
 
@@ -104,7 +102,7 @@
         (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,
         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, gs)
+        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},
@@ -112,7 +110,7 @@
             #{item.houseResourceUse}, #{item.houseResourceEquity}, #{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}, #{item.gs})
+            #{item.planeGraphUrl}, #{item.hireStatus}, #{item.address}, #{item.lon}, #{item.lat}, #{item.remark})
         </foreach>
     </insert>