feat: 房源

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

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

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/enums/HouseEnums.java

@@ -39,7 +39,8 @@ public class HouseEnums {
         ZY(0, "在营"),
         KZ(1, "闲置"),
         GK(2, "挂靠"),
-        SBC(3, "设备层");
+        SBC(3, "设备层"),
+        ZYZY(4, "在营自用");
 
         private final int code;
         private final String desc;

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

@@ -39,6 +39,8 @@ public class BusinessEntityStatisticsDetail {
 
     private long gkCount;
 
+    private long zyzyCount;
+
     private long ztCount;
 
     private BigDecimal gyCount = BigDecimal.ZERO;

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

@@ -263,6 +263,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         businessEntityStatisticsDetail.setZaiyingCount(list.stream().filter(x -> x.getHouseResourceType() == 0).count());
         businessEntityStatisticsDetail.setXzCount(list.stream().filter(x -> x.getHouseResourceType() == 1).count());
         businessEntityStatisticsDetail.setGkCount(list.stream().filter(x -> x.getHouseResourceType() == 2).count());
+        businessEntityStatisticsDetail.setZyzyCount(list.stream().filter(x -> x.getHouseResourceType() == 4).count());
 
         List<String> houseResourceIds = list.stream().map(HouseResource::getId).collect(Collectors.toList());
         List<BusinessEntityInfo> businessEntityInfos = businessEntityInfoMapper.selectAllBusinessEntityInfosByHouseResourceIds(houseResourceIds);

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

@@ -36,6 +36,7 @@
         <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">
@@ -43,12 +44,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)
+         meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, lon, lat, remark, gs)
         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})
+             #{meetingNumber}, #{stationNumber}, #{setUp}, #{labelId}, #{unitPrice}, #{rentalUnit}, #{planeGraphUrl}, #{hireStatus}, #{address}, #{lon}, #{lat}, #{remark}, #{gs})
     </insert>
 
     <select id="selectHouseResourceById" resultType="com.ruoyi.system.domain.house.HouseResource" parameterType="string">
@@ -89,7 +90,8 @@
             address = #{address},
             lon = #{lon},
             lat = #{lat},
-            remark = #{remark}
+            remark = #{remark},
+            gs = #{gs}
         WHERE id = #{id}
     </update>
 
@@ -102,7 +104,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)
+        meeting_number, station_number, set_up, label_id, unit_price, rental_unit, plane_graph_url, hire_status, address, lon, lat, remark, gs)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.id}, #{item.relationId},  #{two}, #{three}, #{four}, #{item.type}, #{item.projectId}, #{item.houseResourceUrl}, #{item.businessLicenseUrl},
@@ -110,7 +112,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.planeGraphUrl}, #{item.hireStatus}, #{item.address}, #{item.lon}, #{item.lat}, #{item.remark}, #{item.gs})
         </foreach>
     </insert>