feat: 房源

ruoyi-system/src/main/java/com/ruoyi/system/mapper/house/BusinessEntityInfoMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.mapper.house;
 import com.ruoyi.system.domain.house.BusinessEntityInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 public interface BusinessEntityInfoMapper {
@@ -27,4 +28,6 @@ public interface BusinessEntityInfoMapper {
     List<BusinessEntityInfo> selectAllBusinessEntityInfosByHouseResourceId(@Param("houseResourceId") String houseResourceId);
 
     List<BusinessEntityInfo> selectAllBusinessEntityInfosByHouseResourceIds(@Param("houseResourceIds") List<String> houseResourceIds);
+
+    BigDecimal selectYearSellByHouseResourceId(@Param("houseResourceId") String houseResourceId);
 }

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

@@ -178,8 +178,25 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     @Override
     public List<HouseResourceProfileGraph> profileGraphHouseResources(HouseResourcePageQuery query) {
         List<HouseResourcePage> list = houseResourceMapper.selectProfileGraph(query);
+        list.forEach(x -> x.setIncome(businessEntityInfoMapper.selectYearSellByHouseResourceId(x.getId())));
+        List<HouseResourcePage> houseResourcePages = handleHouseList(list);
+        if (StringUtils.hasText(query.getName())) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> !CollectionUtils.isEmpty(x.getBusinessEntityInfoNames())).filter(x -> x.getBusinessEntityInfoNames().contains(query.getName())).collect(Collectors.toList());
+        }
+        if (Objects.nonNull(query.getHouseAreaMin())) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> Objects.nonNull(x.getHouseArea())).filter(x -> x.getHouseArea().compareTo(query.getHouseAreaMin()) >= 0).collect(Collectors.toList());
+        }
+        if (Objects.nonNull(query.getHouseAreaMax())) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> Objects.nonNull(x.getHouseArea())).filter(x -> x.getHouseArea().compareTo(query.getHouseAreaMax()) <= 0).collect(Collectors.toList());
+        }
+        if (Objects.nonNull(query.getYearSellMin())) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> x.getIncome().compareTo(query.getYearSellMin()) >= 0).collect(Collectors.toList());
+        }
+        if (Objects.nonNull(query.getYearSellMax())) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> x.getIncome().compareTo(query.getYearSellMax()) <= 0).collect(Collectors.toList());
+        }
         List<HouseResourceProfileGraph> resourceProfileGraphList = new ArrayList<>();
-        Map<String, List<HouseResourcePage>> collect = list.stream().collect(Collectors.groupingBy(HouseResourcePage::getFour));
+        Map<String, List<HouseResourcePage>> collect = houseResourcePages.stream().collect(Collectors.groupingBy(HouseResourcePage::getFour));
         collect.forEach((k, v) -> {
             HouseResourceProfileGraph houseResourceProfileGraph = new HouseResourceProfileGraph();
             houseResourceProfileGraph.setId(k);
@@ -195,8 +212,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             houseResourceProfileGraph.setKzCount(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode()).count());
             houseResourceProfileGraph.setKzArea(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode()).map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
             houseResourceProfileGraph.setAreaTotal(v.stream().map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
-            List<HouseResourcePage> houseResourcePages = handleHouseList(v);
-            houseResourceProfileGraph.setHouseResources(houseResourcePages.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber)).collect(Collectors.toList()));
+            houseResourceProfileGraph.setHouseResources(v.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber)).collect(Collectors.toList()));
             resourceProfileGraphList.add(houseResourceProfileGraph);
         });
         return resourceProfileGraphList.stream().sorted(Comparator.comparing(HouseResourceProfileGraph::getId)).collect(Collectors.toList());

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

@@ -66,4 +66,13 @@
             resultType="com.ruoyi.system.domain.house.BusinessEntityInfo">
         SELECT * FROM business_entity_info WHERE house_resource_id in <foreach collection="houseResourceIds" item="houseResourceId" open="(" close=")" separator=",">#{houseResourceId}</foreach>
     </select>
+    <select id="selectYearSellByHouseResourceId" resultType="java.math.BigDecimal">
+        SELECT
+            IFNULL(SUM(t2.year_sell), 0)
+        FROM
+            business_entity_info t1
+                LEFT JOIN business_entity_sell t2 ON t1.id = t2.business_entity_info_id
+        WHERE
+            t1.house_resource_id = #{houseResourceId}
+    </select>
 </mapper>