feat: 房源

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

@@ -560,6 +560,13 @@ public class HouseResourceServiceImpl implements HouseResourceService {
             x.setDecorationConditionText(HouseEnums.DecorationConditionEnum.getDescByCode(x.getDecorationCondition()));
             x.setRentalUnitText(HouseEnums.RentalUnitEnum.getDescByCode(x.getRentalUnit()));
             x.setHireStatusText(HouseEnums.hireStatusTextEnum.getDescByCode(x.getHireStatus()));
+            List<HouseResourceBusinessEntityInfoMapping> houseResourceBusinessEntityInfoMappings = houseResourceBusinessEntityInfoMappingMapper.selectByHouseResourceId(x.getId());
+            if (!CollectionUtils.isEmpty(houseResourceBusinessEntityInfoMappings)) {
+                List<BusinessEntityInfo> businessEntityInfos = businessEntityInfoMapper.selectByIdList(houseResourceBusinessEntityInfoMappings.stream().map(HouseResourceBusinessEntityInfoMapping::getBusinessEntityInfoId).collect(Collectors.toList()));
+                if (!CollectionUtils.isEmpty(businessEntityInfos)) {
+                    x.setBusinessEntityInfoNames(businessEntityInfos.stream().map(BusinessEntityInfo::getName).collect(Collectors.toList()));
+                }
+            }
         });
         if (houseNumberSortFlag) {
             return list.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber, Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());

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

@@ -58,7 +58,13 @@
         SELECT * FROM business_entity_info
     </select>
     <select id="selectByName" resultType="com.ruoyi.system.domain.house.BusinessEntityInfo">
-        SELECT t2.* FROM house_resource t1 LEFT JOIN business_entity_info t2 ON t1.id = t2.house_resource_id WHERE t2.name like concat('%', #{name}, '%')
+        SELECT
+            t3.*
+        FROM
+            house_resource t1
+                LEFT JOIN house_resource_business_entity_info_mapping t2 ON t1.id = t2.house_resource_id
+                LEFT JOIN business_entity_info t3 ON t2.business_entity_info_id = t3.id
+        WHERE t3.name like concat('%', #{name}, '%')
     </select>
     <select id="selectByIdList" resultType="com.ruoyi.system.domain.house.BusinessEntityInfo">
         SELECT * FROM business_entity_info WHERE id IN