* 代码优化

src/main/java/com/huiju/estateagents/po/TaPreselectionRecordPO.java

@@ -83,4 +83,14 @@ public class TaPreselectionRecordPO extends TaPreselectionRecord {
      * 最后修改人
      */
     private String updateName;
+
+    /**
+     * 房源状态
+     */
+    private String housingStatus;
+
+    /**
+     * 销售批次装填
+     */
+    private String saleBatchStatus;
 }

src/main/java/com/huiju/estateagents/service/impl/TaPreselectionRecordServiceImpl.java

@@ -79,8 +79,8 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
                     buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
                     taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
                     po.setBuildingImgList(taBuildingImgList);
-                    resultList.add(po);
                 }
+                resultList.add(po);
             }
             iPage.setRecords(resultList);
         }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -17,6 +17,7 @@
             t.room_name,
             t.price,
             t.heat,
+            t.real_heat,
             t.apartment_id,
             t.`status`,
             t.org_id,
@@ -56,48 +57,49 @@
 
     <update id="updateForAddHeat" parameterType="java.lang.String">
         UPDATE ta_housing_resources t
-        SET t.heat = t.heat + 1
+        SET t.real_heat = t.real_heat + 1
         WHERE
             t.house_id = #{houseId}
-            AND t.heat >= 0
+            AND t.real_heat >= 0
     </update>
 
     <update id="updateForSubtractHeat" parameterType="java.lang.String">
         UPDATE ta_housing_resources t
-        SET t.heat = t.heat - 1
+        SET t.real_heat = t.real_heat - 1
         WHERE
             t.house_id = #{houseId}
-            AND t.heat > 0
+            AND t.real_heat > 0
     </update>
 
     <select id="getHousingDetailById" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
-        t.house_id,
-        t.building_id,
-        t.block_id,
-        t.block_name,
-        t.sales_batch_id,
-        t.unit_id,
-        t.unit_name,
-        t.floor_id,
-        t.floor_name,
-        t.room_id,
-        t.room_name,
-        t.price,
-        t.heat,
-        t.apartment_id,
-        t.`status`,
-        t.org_id,
-        t2.apartment_name,
-        t2.inside_area,
-        t2.building_area,
-        t3.preselection_start_time,
-        t3.preselection_end_time,
-        t3.`status` saleBatchStatus
+            t.house_id,
+            t.building_id,
+            t.block_id,
+            t.block_name,
+            t.sales_batch_id,
+            t.unit_id,
+            t.unit_name,
+            t.floor_id,
+            t.floor_name,
+            t.room_id,
+            t.room_name,
+            t.price,
+            t.heat,
+            t.real_heat,
+            t.apartment_id,
+            t.`status`,
+            t.org_id,
+            t2.apartment_name,
+            t2.inside_area,
+            t2.building_area,
+            t3.preselection_start_time,
+            t3.preselection_end_time,
+            t3.`status` saleBatchStatus
         FROM
-        ta_housing_resources t,
-        ta_building_apartment t2,
-        ta_sales_batch t3
+            ta_housing_resources t,
+            ta_building_apartment t2,
+            ta_sales_batch t3
         WHERE
         t.house_id = #{houseId}
         AND t.apartment_id = t2.apartment_id

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -5,18 +5,26 @@
     <select id="listPreselectionRecord" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
         SELECT
             t3.*,
-            t4.building_name
+            t4.building_name,
+            t5.`status` saleBatchStatus
         FROM
             (
         SELECT
-            t.*,
+            t.preselection_record_id,
+            t.person_id,
+            t.org_id,
+            t.house_id,
+            t.`status`,
+            t.create_date,
             t2.block_name,
             t2.unit_name,
             t2.floor_name,
             t2.room_name,
             t2.price,
             t2.apartment_id,
-            t2.building_id buildingId
+            t2.building_id buildingId,
+            t2.`status` housingStatus,
+            t2.sales_batch_id saleBatchId
         FROM
             ta_preselection_record t,
             ta_housing_resources t2
@@ -27,6 +35,7 @@
             t.create_date DESC
             ) t3
             LEFT JOIN ta_building t4 ON t3.buildingId = t4.building_id
+            LEFT JOIN ta_sales_batch t5 ON t3.saleBatchId = t5.sales_batch_id
     </select>
 
     <select id="getRecordByPersonIdAndHouseId" resultType="com.huiju.estateagents.entity.TaPreselectionRecord">