Merge branch 'dev' into 'main'

feat: 房源

See merge request !2

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

@@ -39,7 +39,7 @@ public class HouseResourceController {
         return AjaxResult.success();
     }
 
-    @PutMapping("batch")
+    @PostMapping("/batch")
     public AjaxResult batchSaveHouseResources(@RequestBody List<HouseResource> houseResources) {
         houseResourceService.batchSaveHouseResources(houseResources);
         return AjaxResult.success();

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

@@ -12,6 +12,12 @@ public class HouseResource implements Serializable {
 
     private String relationId;
 
+    private String two;
+
+    private String three;
+
+    private String four;
+
     private int type;
 
     private String projectId;
@@ -30,6 +36,8 @@ public class HouseResource implements Serializable {
 
     private String houseResourceEquity;
 
+    private String houseResourceEquityTel;
+
     private String decorationCondition;
 
     private String orientation;

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

@@ -4,6 +4,9 @@
     <resultMap id="BaseResultMap" type="com.ruoyi.system.domain.house.HouseResource">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="relationId" column="relation_id" jdbcType="VARCHAR"/>
+        <result property="two" column="two" jdbcType="VARCHAR"/>
+        <result property="three" column="three" jdbcType="VARCHAR"/>
+        <result property="four" column="four" jdbcType="VARCHAR"/>
         <result property="type" column="type" jdbcType="INTEGER"/>
         <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
         <result property="houseResourceUrl" column="house_resource_url" jdbcType="VARCHAR"/>
@@ -13,6 +16,7 @@
         <result property="houseResourceType" column="house_resource_type" jdbcType="VARCHAR"/>
         <result property="houseResourceUse" column="house_resource_use" jdbcType="VARCHAR"/>
         <result property="houseResourceEquity" column="house_resource_equity" jdbcType="VARCHAR"/>
+        <result property="houseResourceEquityTel" column="house_resource_equity_tel" jdbcType="VARCHAR"/>
         <result property="decorationCondition" column="decoration_condition" jdbcType="VARCHAR"/>
         <result property="orientation" column="orientation" jdbcType="VARCHAR"/>
         <result property="landingHeadFlag" column="landing_head_flag" jdbcType="BIT"/>
@@ -28,13 +32,13 @@
 
     <insert id="insertHouseResource" parameterType="com.ruoyi.system.domain.house.HouseResource">
         INSERT INTO house_resource
-        (id, relation_id, type, project_id, house_resource_url, house_number, house_area,
-         house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity,
+        (id, relation_id, two, three, four, type, project_id, house_resource_url, house_number, house_area,
+         house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, house_resource_equity_tel,
          decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
          meeting_number, station_number, set_up, label_id, unit_price, plane_graph_url)
         VALUES
-            (#{id}, #{relationId}, #{type}, #{projectId}, #{houseResourceUrl}, #{houseNumber}, #{houseArea},
-             #{houseResourceAttribute}, #{houseResourceType}, #{houseResourceUse}, #{houseResourceEquity},
+            (#{id}, #{relationId}, #{two}, #{three}, #{four}, #{type}, #{projectId}, #{houseResourceUrl}, #{houseNumber}, #{houseArea},
+             #{houseResourceAttribute}, #{houseResourceType}, #{houseResourceUse}, #{houseResourceEquity}, #{houseResourceEquityTel},
              #{decorationCondition}, #{orientation}, #{landingHeadFlag}, #{commonAreaNumber}, #{officeNumber},
              #{meetingNumber}, #{stationNumber}, #{setUp}, #{labelId}, #{unitPrice}, #{planeGraphUrl})
     </insert>
@@ -46,6 +50,9 @@
     <update id="updateHouseResource" parameterType="com.ruoyi.system.domain.house.HouseResource">
         UPDATE house_resource
         SET relation_id = #{relationId},
+            two = #{two},
+            three = #{three},
+            four = #{four},
             type = #{type},
             project_id = #{projectId},
             house_resource_url = #{houseResourceUrl},
@@ -55,6 +62,7 @@
             house_resource_type = #{houseResourceType},
             house_resource_use = #{houseResourceUse},
             house_resource_equity = #{houseResourceEquity},
+            house_resource_equity_tel = #{houseResourceEquityTel},
             decoration_condition = #{decorationCondition},
             orientation = #{orientation},
             landing_head_flag = #{landingHeadFlag},
@@ -75,15 +83,15 @@
 
     <insert id="batchInsertHouseResources" parameterType="java.util.List">
         INSERT INTO house_resource
-        (id, relation_id, type, project_id, house_resource_url, house_number, house_area,
-        house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity,
+        (id, relation_id, two, three, four, type, project_id, house_resource_url, house_number, house_area,
+        house_resource_attribute, house_resource_type, house_resource_use, house_resource_equity, house_resource_equity_tel,
         decoration_condition, orientation, landing_head_flag, common_area_number, office_number,
         meeting_number, station_number, set_up, label_id, unit_price, plane_graph_url)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.relationId}, #{item.type}, #{item.projectId}, #{item.houseResourceUrl},
+            (#{item.id}, #{item.relationId},  #{two}, #{three}, #{four}, #{item.type}, #{item.projectId}, #{item.houseResourceUrl},
             #{item.houseNumber}, #{item.houseArea}, #{item.houseResourceAttribute}, #{item.houseResourceType},
-            #{item.houseResourceUse}, #{item.houseResourceEquity}, #{item.decorationCondition},
+            #{item.houseResourceUse}, #{item.houseResourceEquity}, #{item.houseResourceEquityTel}, #{item.decorationCondition},
             #{item.orientation}, #{item.landingHeadFlag}, #{item.commonAreaNumber}, #{item.officeNumber},
             #{item.meetingNumber}, #{item.stationNumber}, #{item.setUp}, #{item.labelId}, #{item.unitPrice},
             #{item.planeGraphUrl})