Merge branch 'dev' into 'main'

Dev

See merge request !212

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

@@ -77,4 +77,6 @@ public class HouseResource implements Serializable {
     private String lat;
 
     private String remark;
+
+    private Integer showFlag;
 }

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

@@ -69,4 +69,6 @@ public class HouseResourcePageQuery extends PageDomain {
     private BigDecimal unitPriceMin;
 
     private BigDecimal unitPriceMax;
+
+    private Boolean gsFlag;
 }

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

@@ -335,7 +335,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         businessEntityStatisticsDetail.setScCount(list.stream().filter(x -> x.getType() == 7).count());
 
         businessEntityStatisticsDetail.setSjLyCount(list.stream().filter(x -> x.getType() == 1).collect(Collectors.groupingBy(HouseResourcePage::getThree)).size());
-        businessEntityStatisticsDetail.setSjJqCount(list.stream().filter(x -> x.getType() == 4).collect(Collectors.groupingBy(HouseResourcePage::getThree)).size());
+        businessEntityStatisticsDetail.setSjJdCount(list.stream().filter(x -> x.getType() == 4).collect(Collectors.groupingBy(HouseResourcePage::getThree)).size());
         businessEntityStatisticsDetail.setSjJqCount(list.stream().filter(x -> x.getType() == 5).collect(Collectors.groupingBy(HouseResourcePage::getThree)).size());
         businessEntityStatisticsDetail.setSjZhtCount(list.stream().filter(x -> x.getType() == 6).collect(Collectors.groupingBy(HouseResourcePage::getThree)).size());
         businessEntityStatisticsDetail.setSjScCount(list.stream().filter(x -> x.getType() == 7).collect(Collectors.groupingBy(HouseResourcePage::getThree)).size());

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

@@ -37,6 +37,7 @@
         <result property="lon" column="lon" jdbcType="VARCHAR"/>
         <result property="lat" column="lat" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <result property="showFlag" column="show_flag" jdbcType="INTEGER"/>
     </resultMap>
 
     <insert id="insertHouseResource" parameterType="com.ruoyi.system.domain.house.HouseResource">
@@ -134,7 +135,7 @@
         LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
         LEFT JOIN business_entity_info t3 ON t1.id = t3.house_resource_id
         LEFT JOIN business_entity_sell t4 ON t4.business_entity_info_id = t3.id
-        where t1.rental_unit = 5
+        WHERE t1.rental_unit = 5
         <if test="query.wgType != null">
             and t1.type = #{query.wgType}
         </if>
@@ -168,11 +169,8 @@
         <if test="query.yearSellMin != null and query.yearSellMin != '' and query.yearSellMax != null and query.yearSellMax != ''">
             and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
         </if>
-        <if test="query.yearTaxMin != null and query.yearTaxMin != '' and query.yearTaxMax != null and query.yearTaxMax != ''">
-            and t4.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin} and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
-        </if>
-        <if test="query.unitPriceMin != null and query.unitPriceMin != '' and query.unitPriceMax != null and query.unitPriceMax != ''">
-            and t1.unit_price <![CDATA[ >= ]]> #{query.unitPriceMin} and t1.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
+        <if test="query.gsFlag != null and query.gsFlag != ''">
+            and t3.gs = ${query.gsFlag}
         </if>
         <if test="query.wgCodes != null and query.wgCodes.size() > 0">
             and t1.two in