Merge branch 'dev' into 'main'

Dev

See merge request !115

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

@@ -24,4 +24,8 @@ public class BusinessEntityInfo implements Serializable {
     private String business;
 
     private Integer workerNumber;
+
+    private String registeredAddress;
+
+    private String industryClassification;
 }

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

@@ -2,6 +2,8 @@ package com.ruoyi.system.domain.house;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class BusinessEntitySell {
 
@@ -11,9 +13,9 @@ public class BusinessEntitySell {
 
     private Integer year;
 
-    private String yearSell;
+    private BigDecimal yearSell;
 
-    private String yearTax;
+    private BigDecimal yearTax;
 
     private String compare;
 }

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

@@ -37,7 +37,7 @@ public class HouseEnums {
     public enum HouseResourceTypeEnum {
         // 房源类型
         ZY(0, "在营"),
-        KZ(1, "空置"),
+        KZ(1, "闲置"),
         GK(2, "挂靠");
 
         private final int code;

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

@@ -26,5 +26,9 @@ public class BusinessEntityDto {
 
     private Integer workerNumber;
 
+    private String registeredAddress;
+
+    private String industryClassification;
+
     private List<BusinessEntitySell> businessEntitySells;
 }

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

@@ -15,7 +15,7 @@ public class HouseResourcePageQuery extends PageDomain {
 
     private String four;
 
-    private String houseResourceAttribute;
+    private Integer houseResourceAttribute;
 
     private String sortWay;
 

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

@@ -11,15 +11,17 @@
         <result column="principal_tel" property="principalTel" jdbcType="VARCHAR"/>
         <result column="business" property="business" jdbcType="VARCHAR"/>
         <result column="worker_number" property="workerNumber" jdbcType="INTEGER"/>
+        <result column="registered_address" property="registeredAddress" jdbcType="VARCHAR"/>
+        <result column="industry_classification" property="industryClassification" jdbcType="VARCHAR"/>
     </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
+            principal, principal_tel, business, worker_number, registered_address, industry_classification
         ) VALUES (
                      #{id}, #{houseResourceId}, #{name}, #{nature}, #{socialCreditCode},
-                     #{principal}, #{principalTel}, #{business}, #{workerNumber}
+                     #{principal}, #{principalTel}, #{business}, #{workerNumber}, #{registeredAddress}, #{industryClassification}
                  )
     </insert>
 
@@ -38,6 +40,8 @@
             <if test="principalTel != null">principal_tel=#{principalTel},</if>
             <if test="business != null">business=#{business},</if>
             <if test="workerNumber != null">worker_number=#{workerNumber},</if>
+            <if test="registeredAddress != null">registered_address=#{registeredAddress},</if>
+            <if test="industryClassification != null">industry_classification=#{industryClassification},</if>
         </set>
         WHERE id=#{id}
     </update>

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

@@ -5,8 +5,8 @@
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <result column="business_entity_info_id" property="businessEntityInfoId" jdbcType="VARCHAR"/>
         <result column="year" property="year" jdbcType="INTEGER"/>
-        <result column="year_sell" property="yearSell" jdbcType="VARCHAR"/>
-        <result column="year_tax" property="yearTax" jdbcType="VARCHAR"/>
+        <result column="year_sell" property="yearSell" jdbcType="DECIMAL"/>
+        <result column="year_tax" property="yearTax" jdbcType="DECIMAL"/>
         <result column="compare" property="compare" jdbcType="VARCHAR"/>
     </resultMap>
 

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

@@ -130,7 +130,7 @@
             <if test="query.four != null and query.four != ''">
                 and t2.four = #{query.four}
             </if>
-            <if test="query.houseResourceAttribute != null and query.houseResourceAttribute != ''">
+            <if test="query.houseResourceAttribute != null">
                 and t2.house_resource_attribute = #{query.houseResourceAttribute}
             </if>
             <if test="query.hireStatus != null">