Merge branch 'dev-lx' into dev

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

@@ -24,6 +24,8 @@ public class HouseResource implements Serializable {
 
     private String houseResourceUrl;
 
+    private String businessLicenseUrl;
+
     private String houseNumber;
 
     private BigDecimal houseArea;
@@ -71,4 +73,6 @@ public class HouseResource implements Serializable {
     private String lon;
 
     private String lat;
+
+    private String remark;
 }

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

@@ -32,6 +32,8 @@ public class HouseResourceDetail {
 
     private List<String> houseResourceUrlList;
 
+    private String businessLicenseUrl;
+
     private String houseNumber;
 
     private BigDecimal houseArea;
@@ -92,5 +94,7 @@ public class HouseResourceDetail {
 
     private String lat;
 
+    private String remark;
+
     private List<BusinessEntityDto> businessEntityDtoList;
 }

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

@@ -32,6 +32,8 @@ public class HouseResourcePage {
 
     private List<String> houseResourceUrlList;
 
+    private String businessLicenseUrl;
+
     private String houseNumber;
 
     private BigDecimal houseArea;
@@ -92,5 +94,7 @@ public class HouseResourcePage {
 
     private String lat;
 
+    private String remark;
+
     private List<String> businessEntityInfoNames;
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain.house.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -11,5 +12,9 @@ public class HouseResourceProfileGraph {
 
     private String wgName;
 
+    private BigDecimal jzArea;
+
+    private BigDecimal jyArea;
+
     private List<HouseResourcePage> houseResources;
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -168,6 +168,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             if (StringUtils.hasText(wgName)) {
                 houseResourceProfileGraph.setWgName(wgName);
             }
+            houseResourceProfileGraph.setJyArea(v.stream().map(HouseResourcePage::getHouseArea).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
             List<HouseResourcePage> houseResourcePages = handleHouseList(v);
             houseResourceProfileGraph.setHouseResources(houseResourcePages.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber)).collect(Collectors.toList()));
             resourceProfileGraphList.add(houseResourceProfileGraph);

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

@@ -10,6 +10,7 @@
         <result property="type" column="type" jdbcType="INTEGER"/>
         <result property="projectId" column="project_id" jdbcType="VARCHAR"/>
         <result property="houseResourceUrl" column="house_resource_url" jdbcType="VARCHAR"/>
+        <result property="businessLicenseUrl" column="business_license_url" jdbcType="VARCHAR"/>
         <result property="houseNumber" column="house_number" jdbcType="VARCHAR"/>
         <result property="houseArea" column="house_area" jdbcType="DECIMAL"/>
         <result property="houseResourceAttribute" column="house_resource_attribute" jdbcType="INTEGER"/>
@@ -34,19 +35,20 @@
         <result property="address" column="address" jdbcType="VARCHAR"/>
         <result property="lon" column="lon" jdbcType="VARCHAR"/>
         <result property="lat" column="lat" jdbcType="VARCHAR"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
     </resultMap>
 
     <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, house_number, house_area,
+        (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)
+         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}, #{houseNumber}, #{houseArea},
+            (#{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})
+             #{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">
@@ -62,6 +64,7 @@
             type = #{type},
             project_id = #{projectId},
             house_resource_url = #{houseResourceUrl},
+            business_license_url = #{businessLicenseUrl},
             house_number = #{houseNumber},
             house_area = #{houseArea},
             house_resource_attribute = #{houseResourceAttribute},
@@ -85,7 +88,8 @@
             hire_status = #{hireStatus},
             address = #{address},
             lon = #{lon},
-            lat = #{lat}
+            lat = #{lat},
+            remark = #{remark}
         WHERE id = #{id}
     </update>
 
@@ -95,18 +99,18 @@
 
     <insert id="batchInsertHouseResources" parameterType="java.util.List">
         INSERT INTO house_resource
-        (id, relation_id, two, three, four, type, project_id, house_resource_url, house_number, house_area,
+        (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)
+        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.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.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.planeGraphUrl}, #{item.hireStatus}, #{item.address}, #{item.lon}, #{item.lat}, #{item.remark})
         </foreach>
     </insert>