feat: 房源

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

@@ -320,19 +320,11 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                 if (CollectionUtils.isEmpty(collect)) {
                     houseResourceProfileGraph.setHouseResources(Collections.emptyList());
                     result.add(houseResourceProfileGraph);
-                    if (StringUtils.hasText(query.getFourOrHouseNumber())) {
-                        result = result.stream().filter(x -> StringUtils.hasText(x.getWgName())).filter(x -> x.getWgName().contains(query.getFourOrHouseNumber())).collect(Collectors.toList());
-                    }
                 } else {
-                    if (StringUtils.hasText(query.getFourOrHouseNumber())) {
-                        collect = collect.stream().filter(x -> StringUtils.hasText(x.getHouseNumber())).filter(x -> x.getHouseNumber().contains(query.getFourOrHouseNumber()) || x.getFour().contains(query.getFourOrHouseNumber())).collect(Collectors.toList());
-                    }
-                    if (!CollectionUtils.isEmpty(collect)) {
                     houseResourceProfileGraph.setHouseResources(handleHouseList(collect, true));
                     result.add(houseResourceProfileGraph);
                 }
             }
-            }
             result.forEach(x -> {
                 x.setJyArea(x.getHouseResources().stream().filter(y -> y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.ZY.getCode() || y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.ZYZY.getCode() || y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.GK.getCode()).map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
                 x.setKzArea(x.getHouseResources().stream().filter(y -> y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode() || y.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.SBC.getCode()).map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));

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

@@ -566,6 +566,9 @@
             <if test="query.nature != null and query.nature != ''">
                 and t4.nature = #{query.nature}
             </if>
+            <if test="query.fourOrHouseNumber != null and query.fourOrHouseNumber != ''">
+                and (t1.four like concat('%', #{query.fourOrHouseNumber}, '%') or t1.house_number like concat('%', #{query.fourOrHouseNumber}, '%'))
+            </if>
             <if test="query.wgCodes != null and query.wgCodes.size() > 0">
                 and t1.two in
                 <foreach item="item" index="index" collection="query.wgCodes" open="(" separator="," close=")">