* 代码优化

src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java

@@ -225,7 +225,7 @@ public class TaHousingResourcesController extends BaseController {
                 orgId, salesBatchId, startPrice, endPrice, apartmentId);
 
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId));
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, 1));
         } catch (Exception e) {
             logger.error("listHousingResources -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -247,7 +247,7 @@ public class TaHousingResourcesController extends BaseController {
         Integer orgId = getOrgId(request);
 
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, "", "", ""));
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, "", "", "", 0));
         } catch (Exception e) {
             logger.error("listHousingResourcesFormCms -=- {}", e);
             responseBean.addError(e.getMessage());

src/main/java/com/huiju/estateagents/mapper/TaHousingResourcesMapper.java

@@ -30,13 +30,15 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @param startPrice
      * @param endPrice
      * @param apartmentId
+     * @param type         为1只展示已发布的房源
      * @return
      */
     List<TaHousingResourcesPO> listHousingResources(@Param("orgId") Integer orgId,
-                                                     @Param("salesBatchId") String salesBatchId,
-                                                     @Param("startPrice") String startPrice,
-                                                     @Param("endPrice") String endPrice,
-                                                     @Param("apartmentId") String apartmentId);
+                                                    @Param("salesBatchId") String salesBatchId,
+                                                    @Param("startPrice") String startPrice,
+                                                    @Param("endPrice") String endPrice,
+                                                    @Param("apartmentId") String apartmentId,
+                                                    @Param("type") Integer type);
 
     /**
      * 获取某销售批次下所有房源户型
@@ -74,6 +76,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
 
     /**
      * 分页获取数据
+     *
      * @param pg
      * @param salesBatchId
      * @param buildingId
@@ -88,8 +91,8 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @param houseId
      * @return
      */
-    IPage<TaHousingResources> getHouseResourceList(IPage<TaHousingResources> pg,@Param("salesBatchId") Integer salesBatchId,@Param("buildingId") String buildingId,
-                                                   @Param("orgId") Integer orgId,@Param("termName") String termName,@Param("blockName") String blockName,
-                                                   @Param("unitName") String unitName,@Param("floorName") String floorName,@Param("roomName") String roomName,
-                                                   @Param("apartmentId") String apartmentId,@Param("status") Integer status,@Param("houseId") String houseId);
+    IPage<TaHousingResources> getHouseResourceList(IPage<TaHousingResources> pg, @Param("salesBatchId") Integer salesBatchId, @Param("buildingId") String buildingId,
+                                                   @Param("orgId") Integer orgId, @Param("termName") String termName, @Param("blockName") String blockName,
+                                                   @Param("unitName") String unitName, @Param("floorName") String floorName, @Param("roomName") String roomName,
+                                                   @Param("apartmentId") String apartmentId, @Param("status") Integer status, @Param("houseId") String houseId);
 }

src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java

@@ -26,9 +26,10 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param startPrice
      * @param endPrice
      * @param apartmentId
+     * @param type  为1只展示已发布的房源
      * @return
      */
-    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId);
+    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, Integer type);
 
     /**
      * 获取某销售批次下所有房源户型
@@ -104,6 +105,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
 
     /**
      * 保存文件
+     *
      * @param file
      * @param salesBatchId
      * @param buildingId

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

@@ -87,18 +87,19 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
      * @param startPrice
      * @param endPrice
      * @param apartmentId
+     * @param type
      * @return
      */
     @Override
-    public List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId) {
-        logger.info("listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}",
-                orgId, salesBatchId, startPrice, endPrice, apartmentId);
+    public List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, Integer type) {
+        logger.info("listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}，type：{}",
+                orgId, salesBatchId, startPrice, endPrice, apartmentId, type);
 
         startPrice = StringUtils.isEmpty(startPrice) ? null : startPrice;
         endPrice = StringUtils.isEmpty(endPrice) ? null : endPrice;
 
         List<TaHousingResourcesPO> resourcesPOList =
-                taHousingResourcesMapper.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId);
+                taHousingResourcesMapper.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, type);
 
         return resourcesPOList;
     }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -54,6 +54,7 @@
         LEFT JOIN ta_building_block t3 ON t.block_id = t3.block_id
         WHERE
             t.sales_batch_id = #{salesBatchId}
+            AND t.org_id = #{orgId}
             <choose>
                 <when test=" endPrice != null and startPrice == null">
                     AND t.price &lt;= #{endPrice}
@@ -70,8 +71,15 @@
             <if test="apartmentId != null and apartmentId != ''">
                 AND t.apartment_id = #{apartmentId}
             </if>
-            AND t.org_id = #{orgId}
-            AND t.`status` > 0
+            <choose>
+                <when test="type == 1">
+                    AND t.`status` > 0
+                </when>
+                <otherwise>
+                    AND t.`status` > -1
+                </otherwise>
+            </choose>
+
           ) t5
         ORDER BY
             t5.termNamePre,