feat: 房源

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

@@ -467,10 +467,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         CompletableFuture<BigDecimal> gsSsCountFuture = CompletableFuture.supplyAsync(() -> list.stream().filter(x -> Objects.nonNull(x.getGs()) && x.getGs().equals(Boolean.TRUE)).map(HouseResourcePage::getTaxCount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add), executor);
         CompletableFuture<BigDecimal> gsXsCountFuture = CompletableFuture.supplyAsync(() -> list.stream().filter(x -> Objects.nonNull(x.getGs()) && x.getGs().equals(Boolean.TRUE)).map(HouseResourcePage::getIncome).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add), executor);
 
-        List<String> houseResourceIds = list.stream().map(HouseResourcePage::getId).collect(Collectors.toList());
-        List<HouseResourceBusinessEntityInfoMapping> houseResourceMappings = houseResourceBusinessEntityInfoMappingMapper.selectByHouseResourceIds(houseResourceIds);
-        List<BusinessEntityInfo> businessEntityInfos = CollectionUtils.isEmpty(houseResourceMappings) ? Collections.emptyList() :
-                businessEntityInfoMapper.selectByIdList(houseResourceMappings.stream().map(HouseResourceBusinessEntityInfoMapping::getBusinessEntityInfoId).collect(Collectors.toList()));
+        List<BusinessEntityInfo> businessEntityInfos = businessEntityInfoMapper.selectByIdList(list.stream().map(HouseResourcePage::getBusinessEntityInfoId).collect(Collectors.toList()));
         businessEntityStatisticsDetail.setZtCount(businessEntityInfos.size());
 
         List<String> industries = Arrays.asList("工业", "建筑业", "批发", "零售", "住宿", "餐饮", "服务业", "其他");

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

@@ -273,7 +273,7 @@
                 )
             </if>
         </where>
-        GROUP BY t1.id, t3.id
+        GROUP BY t1.id, t4.id
         <trim prefix="having" prefixOverrides="and">
             <if test="query.dayPriceMin != null and query.dayPriceMin != ''">
                 and dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}
@@ -297,7 +297,8 @@
         ROUND(IFNULL(t1.unit_price,0) * 10000 / 365 / t1.house_area, 1) AS dayPrice,
         t4.name,
         t5.year,
-        t4.gs
+        t4.gs,
+        t4.id AS businessEntityInfoId
         FROM
         house_resource t1
         LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
@@ -440,7 +441,7 @@
                 )
             </if>
         </where>
-        GROUP BY t1.id, t3.id
+        GROUP BY t1.id, t4.id
         <trim prefix="having" prefixOverrides="and">
             <if test="query.dayPriceMin != null and query.dayPriceMin != ''">
                 and dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}
@@ -605,7 +606,7 @@
                 )
             </if>
         </where>
-        GROUP BY t1.id, t3.id
+        GROUP BY t1.id, t4.id
         <trim prefix="having" prefixOverrides="and">
             <if test="query.dayPriceMin != null and query.dayPriceMin != ''">
                 and dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}
@@ -760,7 +761,7 @@
                 </foreach>
             </if>
         </where>
-        GROUP BY t1.id, t3.id
+        GROUP BY t1.id, t4.id
         <trim prefix="having" prefixOverrides="and">
             <if test="query.dayPriceMin != null and query.dayPriceMin != ''">
                 and dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}
@@ -784,7 +785,7 @@
                 LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id
                 LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id
                 LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id
-        GROUP BY t1.id, t3.id
+        GROUP BY t1.id, t4.id
     </select>
     <select id="selectForContrast" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
         SELECT