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

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

@@ -175,37 +175,37 @@
                 and t1.house_resource_type = #{query.houseResourceType}
             </if>
             <if test="query.name != null and query.name != ''">
-                and t3.name like concat('%', #{query.name}, '%')
+                and t4.name like concat('%', #{query.name}, '%')
             </if>
             <if test="query.yearSellMin != null and query.yearSellMin != ''">
-                and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
+                and t5.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
             </if>
             <if test="query.yearSellMax != null and query.yearSellMax != ''">
-                and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
+                and t5.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
             <if test="query.yearTaxMin != null and query.yearTaxMin != ''">
-                and t4.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin}
+                and t5.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin}
             </if>
             <if test="query.yearTaxMax != null and query.yearTaxMax != ''">
-                and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
+                and t5.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
             </if>
             <if test="query.unitPriceMin != null and query.unitPriceMin != ''">
                 and t1.unit_price <![CDATA[ >= ]]> #{query.unitPriceMin}
             </if>
             <if test="query.unitPriceMax != null and query.unitPriceMax != ''">
-                and t4.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
+                and t1.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
             </if>
             <if test="query.gsFlag != null and query.gsFlag != ''">
-                and t3.gs = ${query.gsFlag}
+                and t4.gs = ${query.gsFlag}
             </if>
             <if test="query.industryClassification != null and query.industryClassification != ''">
-                and t3.industry_classification like concat('%', #{query.industryClassification}, '%')
+                and t4.industry_classification like concat('%', #{query.industryClassification}, '%')
             </if>
             <if test="query.year != null">
-                and t4.`year` = #{query.year}
+                and t5.`year` = #{query.year}
             </if>
             <if test="query.registrationPlaceFlag != null">
-                and t3.registration_place_flag = #{query.registrationPlaceFlag}
+                and t4.registration_place_flag = #{query.registrationPlaceFlag}
             </if>
             <if test="query.address != null and query.address != ''">
                 and t1.address like concat('%', #{query.address}, '%')
@@ -217,25 +217,25 @@
                 and t1.house_resource_equity_tel like concat('%', #{query.houseResourceEquityTel}, '%')
             </if>
             <if test="query.principal != null and query.principal != ''">
-                and t3.principal like concat('%', #{query.principal}, '%')
+                and t4.principal like concat('%', #{query.principal}, '%')
             </if>
             <if test="query.principalTel != null and query.principalTel != ''">
-                and t3.principalTel like concat('%', #{query.principalTel}, '%')
+                and t4.principalTel like concat('%', #{query.principalTel}, '%')
             </if>
             <if test="query.business != null and query.business != ''">
-                and t3.business like concat('%', #{query.business}, '%')
+                and t4.business like concat('%', #{query.business}, '%')
             </if>
             <if test="query.workerNumberMin != null">
-                and t3.worker_number <![CDATA[ >= ]]> #{query.workerNumberMin}
+                and t4.worker_number <![CDATA[ >= ]]> #{query.workerNumberMin}
             </if>
             <if test="query.workerNumberMax != null">
-                and t3.worker_number <![CDATA[ <= ]]> #{query.workerNumberMax}
+                and t4.worker_number <![CDATA[ <= ]]> #{query.workerNumberMax}
             </if>
             <if test="query.registeredAddress != null and query.registeredAddress != ''">
-                and t3.registered_address like concat('%', #{query.registeredAddress}, '%')
+                and t4.registered_address like concat('%', #{query.registeredAddress}, '%')
             </if>
             <if test="query.nature != null and query.nature != ''">
-                and t3.nature = #{query.nature}
+                and t4.nature = #{query.nature}
             </if>
             <if test="query.wgCodes != null and query.wgCodes.size() > 0">
                 and t1.two in
@@ -282,10 +282,10 @@
                 and dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax}
             </if>
             <if test="query.yearSellMin != null and query.yearSellMin != ''">
-                and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
+                and t5.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
             </if>
             <if test="query.yearSellMax != null and query.yearSellMax != ''">
-                and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
+                and t5.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
         </trim>
         <if test="query.incomeSort != null and query.incomeSort != ''">
@@ -346,37 +346,37 @@
                 and t1.house_resource_type = #{query.houseResourceType}
             </if>
             <if test="query.name != null and query.name != ''">
-                and t3.name like concat('%', #{query.name}, '%')
+                and t4.name like concat('%', #{query.name}, '%')
             </if>
             <if test="query.yearSellMin != null and query.yearSellMin != ''">
-                and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
+                and t5.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
             </if>
             <if test="query.yearSellMax != null and query.yearSellMax != ''">
-                and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
+                and t5.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
             <if test="query.yearTaxMin != null and query.yearTaxMin != ''">
-                and t4.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin}
+                and t5.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin}
             </if>
             <if test="query.yearTaxMax != null and query.yearTaxMax != ''">
-                and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
+                and t5.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
             </if>
             <if test="query.unitPriceMin != null and query.unitPriceMin != ''">
                 and t1.unit_price <![CDATA[ >= ]]> #{query.unitPriceMin}
             </if>
             <if test="query.unitPriceMax != null and query.unitPriceMax != ''">
-                and t4.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
+                and t1.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
             </if>
             <if test="query.gsFlag != null and query.gsFlag != ''">
-                and t3.gs = ${query.gsFlag}
+                and t4.gs = ${query.gsFlag}
             </if>
             <if test="query.industryClassification != null and query.industryClassification != ''">
-                and t3.industry_classification like concat('%', #{query.industryClassification}, '%')
+                and t4.industry_classification like concat('%', #{query.industryClassification}, '%')
             </if>
             <if test="query.year != null">
-                and t4.`year` = #{query.year}
+                and t5.`year` = #{query.year}
             </if>
             <if test="query.registrationPlaceFlag != null">
-                and t3.registration_place_flag = #{query.registrationPlaceFlag}
+                and t4.registration_place_flag = #{query.registrationPlaceFlag}
             </if>
             <if test="query.address != null and query.address != ''">
                 and t1.address like concat('%', #{query.address}, '%')
@@ -388,25 +388,25 @@
                 and t1.house_resource_equity_tel like concat('%', #{query.houseResourceEquityTel}, '%')
             </if>
             <if test="query.principal != null and query.principal != ''">
-                and t3.principal like concat('%', #{query.principal}, '%')
+                and t4.principal like concat('%', #{query.principal}, '%')
             </if>
             <if test="query.principalTel != null and query.principalTel != ''">
-                and t3.principalTel like concat('%', #{query.principalTel}, '%')
+                and t4.principalTel like concat('%', #{query.principalTel}, '%')
             </if>
             <if test="query.business != null and query.business != ''">
-                and t3.business like concat('%', #{query.business}, '%')
+                and t4.business like concat('%', #{query.business}, '%')
             </if>
             <if test="query.workerNumberMin != null">
-                and t3.worker_number <![CDATA[ >= ]]> #{query.workerNumberMin}
+                and t4.worker_number <![CDATA[ >= ]]> #{query.workerNumberMin}
             </if>
             <if test="query.workerNumberMax != null">
-                and t3.worker_number <![CDATA[ <= ]]> #{query.workerNumberMax}
+                and t4.worker_number <![CDATA[ <= ]]> #{query.workerNumberMax}
             </if>
             <if test="query.registeredAddress != null and query.registeredAddress != ''">
-                and t3.registered_address like concat('%', #{query.registeredAddress}, '%')
+                and t4.registered_address like concat('%', #{query.registeredAddress}, '%')
             </if>
             <if test="query.nature != null and query.nature != ''">
-                and t3.nature = #{query.nature}
+                and t4.nature = #{query.nature}
             </if>
             <if test="query.wgCodes != null and query.wgCodes.size() > 0">
                 and t1.two in
@@ -453,10 +453,10 @@
                 and dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax}
             </if>
             <if test="query.yearSellMin != null and query.yearSellMin != ''">
-                and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
+                and t5.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
             </if>
             <if test="query.yearSellMax != null and query.yearSellMax != ''">
-                and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
+                and t5.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
         </trim>
     </select>
@@ -514,37 +514,37 @@
                 and t1.house_resource_type = #{query.houseResourceType}
             </if>
             <if test="query.name != null and query.name != ''">
-                and t3.name like concat('%', #{query.name}, '%')
+                and t4.name like concat('%', #{query.name}, '%')
             </if>
             <if test="query.yearSellMin != null and query.yearSellMin != ''">
-                and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
+                and t5.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
             </if>
             <if test="query.yearSellMax != null and query.yearSellMax != ''">
-                and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
+                and t5.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
             <if test="query.yearTaxMin != null and query.yearTaxMin != ''">
-                and t4.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin}
+                and t5.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin}
             </if>
             <if test="query.yearTaxMax != null and query.yearTaxMax != ''">
-                and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
+                and t5.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
             </if>
             <if test="query.unitPriceMin != null and query.unitPriceMin != ''">
                 and t1.unit_price <![CDATA[ >= ]]> #{query.unitPriceMin}
             </if>
             <if test="query.unitPriceMax != null and query.unitPriceMax != ''">
-                and t4.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
+                and t1.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
             </if>
             <if test="query.gsFlag != null and query.gsFlag != ''">
-                and t3.gs = ${query.gsFlag}
+                and t4.gs = ${query.gsFlag}
             </if>
             <if test="query.industryClassification != null and query.industryClassification != ''">
-                and t3.industry_classification like concat('%', #{query.industryClassification}, '%')
+                and t4.industry_classification like concat('%', #{query.industryClassification}, '%')
             </if>
             <if test="query.year != null">
-                and t4.`year` = #{query.year}
+                and t5.`year` = #{query.year}
             </if>
             <if test="query.registrationPlaceFlag != null">
-                and t3.registration_place_flag = #{query.registrationPlaceFlag}
+                and t4.registration_place_flag = #{query.registrationPlaceFlag}
             </if>
             <if test="query.address != null and query.address != ''">
                 and t1.address like concat('%', #{query.address}, '%')
@@ -556,25 +556,25 @@
                 and t1.house_resource_equity_tel like concat('%', #{query.houseResourceEquityTel}, '%')
             </if>
             <if test="query.principal != null and query.principal != ''">
-                and t3.principal like concat('%', #{query.principal}, '%')
+                and t4.principal like concat('%', #{query.principal}, '%')
             </if>
             <if test="query.principalTel != null and query.principalTel != ''">
-                and t3.principalTel like concat('%', #{query.principalTel}, '%')
+                and t4.principalTel like concat('%', #{query.principalTel}, '%')
             </if>
             <if test="query.business != null and query.business != ''">
-                and t3.business like concat('%', #{query.business}, '%')
+                and t4.business like concat('%', #{query.business}, '%')
             </if>
             <if test="query.workerNumberMin != null">
-                and t3.worker_number <![CDATA[ >= ]]> #{query.workerNumberMin}
+                and t4.worker_number <![CDATA[ >= ]]> #{query.workerNumberMin}
             </if>
             <if test="query.workerNumberMax != null">
-                and t3.worker_number <![CDATA[ <= ]]> #{query.workerNumberMax}
+                and t4.worker_number <![CDATA[ <= ]]> #{query.workerNumberMax}
             </if>
             <if test="query.registeredAddress != null and query.registeredAddress != ''">
-                and t3.registered_address like concat('%', #{query.registeredAddress}, '%')
+                and t4.registered_address like concat('%', #{query.registeredAddress}, '%')
             </if>
             <if test="query.nature != null and query.nature != ''">
-                and t3.nature = #{query.nature}
+                and t4.nature = #{query.nature}
             </if>
             <if test="query.wgCodes != null and query.wgCodes.size() > 0">
                 and t1.two in
@@ -621,10 +621,10 @@
                 and dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax}
             </if>
             <if test="query.yearSellMin != null and query.yearSellMin != ''">
-                and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
+                and t5.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
             </if>
             <if test="query.yearSellMax != null and query.yearSellMax != ''">
-                and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
+                and t5.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
         </trim>
     </select>
@@ -634,6 +634,7 @@
         t3.id AS businessEntityInfoId,
         t1.two,
         t1.three,
+        t1.four,
         t2.wg_name AS wgName4,
         t1.type,
         t1.house_number,
@@ -703,37 +704,37 @@
                 and t1.house_resource_type = #{query.houseResourceType}
             </if>
             <if test="query.name != null and query.name != ''">
-                and t3.name like concat('%', #{query.name}, '%')
+                and t4.name like concat('%', #{query.name}, '%')
             </if>
             <if test="query.yearSellMin != null and query.yearSellMin != ''">
-                and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
+                and t5.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
             </if>
             <if test="query.yearSellMax != null and query.yearSellMax != ''">
-                and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
+                and t5.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
             <if test="query.yearTaxMin != null and query.yearTaxMin != ''">
-                and t4.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin}
+                and t5.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin}
             </if>
             <if test="query.yearTaxMax != null and query.yearTaxMax != ''">
-                and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
+                and t5.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
             </if>
             <if test="query.unitPriceMin != null and query.unitPriceMin != ''">
                 and t1.unit_price <![CDATA[ >= ]]> #{query.unitPriceMin}
             </if>
             <if test="query.unitPriceMax != null and query.unitPriceMax != ''">
-                and t4.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
+                and t1.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
             </if>
             <if test="query.gsFlag != null and query.gsFlag != ''">
-                and t3.gs = ${query.gsFlag}
+                and t4.gs = ${query.gsFlag}
             </if>
             <if test="query.industryClassification != null and query.industryClassification != ''">
-                and t3.industry_classification like concat('%', #{query.industryClassification}, '%')
+                and t4.industry_classification like concat('%', #{query.industryClassification}, '%')
             </if>
             <if test="query.year != null">
-                and t4.`year` = #{query.year}
+                and t5.`year` = #{query.year}
             </if>
             <if test="query.registrationPlaceFlag != null">
-                and t3.registration_place_flag = #{query.registrationPlaceFlag}
+                and t4.registration_place_flag = #{query.registrationPlaceFlag}
             </if>
             <if test="query.address != null and query.address != ''">
                 and t1.address like concat('%', #{query.address}, '%')
@@ -745,25 +746,25 @@
                 and t1.house_resource_equity_tel like concat('%', #{query.houseResourceEquityTel}, '%')
             </if>
             <if test="query.principal != null and query.principal != ''">
-                and t3.principal like concat('%', #{query.principal}, '%')
+                and t4.principal like concat('%', #{query.principal}, '%')
             </if>
             <if test="query.principalTel != null and query.principalTel != ''">
-                and t3.principalTel like concat('%', #{query.principalTel}, '%')
+                and t4.principalTel like concat('%', #{query.principalTel}, '%')
             </if>
             <if test="query.business != null and query.business != ''">
-                and t3.business like concat('%', #{query.business}, '%')
+                and t4.business like concat('%', #{query.business}, '%')
             </if>
             <if test="query.workerNumberMin != null">
-                and t3.worker_number <![CDATA[ >= ]]> #{query.workerNumberMin}
+                and t4.worker_number <![CDATA[ >= ]]> #{query.workerNumberMin}
             </if>
             <if test="query.workerNumberMax != null">
-                and t3.worker_number <![CDATA[ <= ]]> #{query.workerNumberMax}
+                and t4.worker_number <![CDATA[ <= ]]> #{query.workerNumberMax}
             </if>
             <if test="query.registeredAddress != null and query.registeredAddress != ''">
-                and t3.registered_address like concat('%', #{query.registeredAddress}, '%')
+                and t4.registered_address like concat('%', #{query.registeredAddress}, '%')
             </if>
             <if test="query.nature != null and query.nature != ''">
-                and t3.nature = #{query.nature}
+                and t4.nature = #{query.nature}
             </if>
             <if test="query.wgCodes != null and query.wgCodes.size() > 0">
                 and t1.two in
@@ -781,10 +782,10 @@
                 and dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax}
             </if>
             <if test="query.yearSellMin != null and query.yearSellMin != ''">
-                and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
+                and t5.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
             </if>
             <if test="query.yearSellMax != null and query.yearSellMax != ''">
-                and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
+                and t5.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
         </trim>
     </select>
@@ -835,7 +836,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
-        WHERE t1.two = #{two} AND t3.NAME = #{name}
+        WHERE t1.two = #{two} AND t4.NAME = #{name}
     </select>
     <select id="selectByIdList" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
         SELECT * FROM house_resource WHERE id IN