* bug修复

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

@@ -215,23 +215,25 @@ public class TaHousingResourcesController extends BaseController {
      * @param startPrice   房源起始价格
      * @param endPrice     房源结束价格
      * @param apartmentId  户型ID
+     * @param source       来源，raiseChoose 为认筹添加房源来源
      * @param request
      * @return
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
     public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
-                                             String startPrice, String endPrice, String apartmentId,
+                                             String startPrice, String endPrice, String apartmentId, String source,
                                              HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
+        String personId = getPersonId(request);
 
         logger.info("TaHouseingResourcesController.listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}",
                 orgId, salesBatchId, startPrice, endPrice, apartmentId);
 
         try {
             //获取所有楼房的预选热度和认筹热度
-            List<TaHousingResourcesPO> taHousingResourcesPOList = iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, 1);
+            List<TaHousingResourcesPO> taHousingResourcesPOList = iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, personId, source);
             //此处处理我的预选，我的认筹，和我的锁定
             //我的预选记录
             QueryWrapper<TaPreselectionRecord> taPreselectionRecordQueryWrapper = new QueryWrapper<>();
@@ -293,7 +295,7 @@ public class TaHousingResourcesController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, "", "", "", 0));
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResourcesForCms(orgId, salesBatchId, "", "", "", 0));
         } catch (Exception e) {
             logger.error("listHousingResourcesFormCms -=- {}", e);
             responseBean.addError(e.getMessage());

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

@@ -31,7 +31,6 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @param startPrice
      * @param endPrice
      * @param apartmentId
-     * @param type         为1只展示已发布的房源
      * @return
      */
     List<TaHousingResourcesPO> listHousingResources(@Param("orgId") Integer orgId,
@@ -39,7 +38,25 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
                                                     @Param("startPrice") String startPrice,
                                                     @Param("endPrice") String endPrice,
                                                     @Param("apartmentId") String apartmentId,
-                                                    @Param("type") Integer type);
+                                                    @Param("personId") String personId,
+                                                    @Param("source") String source);
+
+    /**
+     * 分页获取房源列表
+     *
+     * @param salesBatchId
+     * @param startPrice
+     * @param endPrice
+     * @param apartmentId
+     * @param type         为1只展示已发布的房源
+     * @return
+     */
+    List<TaHousingResourcesPO> listHousingResourcesForCms(@Param("orgId") Integer orgId,
+                                                          @Param("salesBatchId") String salesBatchId,
+                                                          @Param("startPrice") String startPrice,
+                                                          @Param("endPrice") String endPrice,
+                                                          @Param("apartmentId") String apartmentId,
+                                                          @Param("type") Integer type);
 
     /**
      * 获取某销售批次下所有房源户型
@@ -125,10 +142,10 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @return
      */
     Integer batchUpdateHeat(@Param("housingResourcesList") List<TaHousingResources> housingResourcesList,
-                                 @Param("heat") Integer heat,
-                                 @Param("updateUser") Integer updateUser,
-                                 @Param("salesBatchId") Integer salesBatchId,
-                                 @Param("orgId") Integer orgId);
+                            @Param("heat") Integer heat,
+                            @Param("updateUser") Integer updateUser,
+                            @Param("salesBatchId") Integer salesBatchId,
+                            @Param("orgId") Integer orgId);
 
     /**
      * 根据认筹单ID查询房源列表

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

@@ -29,7 +29,19 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param type  为1只展示已发布的房源
      * @return
      */
-    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, Integer type);
+    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId,String personId,String source );
+
+
+    /* 分页获取房源列表-后台管理端
+     *
+     * @param salesBatchId 销售批次ID
+     * @param startPrice
+     * @param endPrice
+     * @param apartmentId
+     * @param type  为1只展示已发布的房源
+     * @return
+     */
+    List<TaHousingResourcesPO> listHousingResourcesForCms(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, Integer type);
 
     /**
      * 获取某销售批次下所有房源户型

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

@@ -9,15 +9,9 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.mapper.TaApartmentImgMapper;
-import com.huiju.estateagents.mapper.TaBuildingImgMapper;
-import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
-import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
 import com.huiju.estateagents.po.BuildingImgPO;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
-import com.huiju.estateagents.service.ITaPersonService;
-import io.swagger.models.auth.In;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
@@ -107,19 +101,43 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
      * @param startPrice
      * @param endPrice
      * @param apartmentId
+     * @return
+     */
+    @Override
+    public List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId,
+                                                           String personId, String source) {
+        logger.info("listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{},source:{}",
+                orgId, salesBatchId, startPrice, endPrice, apartmentId, source);
+
+        startPrice = StringUtils.isEmpty(startPrice) ? null : startPrice;
+        endPrice = StringUtils.isEmpty(endPrice) ? null : endPrice;
+
+        List<TaHousingResourcesPO> resourcesPOList =
+                taHousingResourcesMapper.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, personId, source);
+
+        return resourcesPOList;
+    }
+
+    /**
+     * 分页获取房源列表-后台管理端
+     *
+     * @param salesBatchId 销售批次ID
+     * @param startPrice
+     * @param endPrice
+     * @param apartmentId
      * @param type
      * @return
      */
     @Override
-    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：{}",
+    public List<TaHousingResourcesPO> listHousingResourcesForCms(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, Integer type) {
+        logger.info("listHousingResourcesForCms 接收参数：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, type);
+                taHousingResourcesMapper.listHousingResourcesForCms(orgId, salesBatchId, startPrice, endPrice, apartmentId, type);
 
         return resourcesPOList;
     }
@@ -257,7 +275,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         TaRaise taRaise = taRaiseMapper.selectOne(taRaiseQueryWrapper);
         if (null == taRaise) {
             resourcesPO.setRaiseBtn(false);
-        }else{
+        } else {
             resourcesPO.setTaRaise(taRaise);
         }
 
@@ -667,7 +685,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
                 return responseBean;
             }
-            responseBean.addError("无权操作");
+            responseBean.addError("权限不足");
             return responseBean;
         }
 
@@ -693,7 +711,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
                 return responseBean;
             }
-            responseBean.addError("无权操作");
+            responseBean.addError("权限不足");
             return responseBean;
         }
         responseBean.addError("fail");

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -3,6 +3,102 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaHousingResourcesMapper">
 
     <select id="listHousingResources" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        t.house_id,
+        (
+        CASE
+        WHEN ( SELECT num_char_extract ( t.term_name, 2 ) + 0 ) = 0 THEN
+        ( SELECT num_char_extract ( t.term_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.term_name, 2 ) + 0 )
+        END
+        ) termNamePre,
+        (
+        CASE
+        WHEN ( SELECT num_char_extract ( t.block_name, 2 ) + 0 ) = 0 THEN
+        ( SELECT num_char_extract ( t.block_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.block_name, 2 ) + 0 )
+        END
+        ) blockNamePre,
+        (
+        CASE
+        WHEN ( SELECT num_char_extract ( t.unit_name, 2 ) + 0 ) = 0 THEN
+        ( SELECT num_char_extract ( t.unit_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.unit_name, 2 ) + 0 )
+        END
+        ) unitNamePre,
+        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.inside_area,
+        t2.building_area,
+        t2.apartment_name,
+        t3.term_id,
+        t.term_name,
+        t.raise_heat,
+        t.raise_real_heat,
+        t.house_locking_status
+        FROM
+        ta_housing_resources t
+        LEFT JOIN ta_building_apartment t2 ON t.apartment_id = t2.apartment_id
+        LEFT JOIN ta_building_block t3 ON t.block_id = t3.block_id
+        LEFT JOIN ta_sales_batch t4 ON t.sales_batch_id = t4.sales_batch_id
+        <if test="source == 'raiseChoose'">
+            LEFT JOIN ta_raise_house t5 ON t.house_id = t5.house_id
+            LEFT JOIN ta_raise_record t6 ON t6.raise_record_id = t5.raise_record_id
+        </if>
+        WHERE
+        t.sales_batch_id = #{salesBatchId}
+        AND t.org_id = #{orgId}
+        AND t.`status` > 0
+        AND t4.`status` = 1
+        <if test = "source == 'raiseChoose'">
+            AND ( t6.`status` != 0 OR t6.`status` IS NULL )
+            <if test="personId != null and personId != ''">
+                AND t6.person_id != #{personId}
+            </if>
+            AND (t.house_locking_status  != 'locked'
+            OR t.house_locking_status IS NULL)
+        </if>
+        <choose>
+            <when test=" endPrice != null and startPrice == null">
+                AND t.price &lt;= #{endPrice}
+            </when>
+            <when test=" startPrice != null and endPrice == null">
+                AND t.price &gt;= #{startPrice}
+            </when>
+            <when test="startPrice != null and endPrice != null ">
+                AND ( t.price BETWEEN #{startPrice} AND #{endPrice} )
+            </when>
+            <otherwise>
+            </otherwise>
+        </choose>
+        <if test="apartmentId != null and apartmentId != ''">
+            AND t.apartment_id = #{apartmentId}
+        </if>
+        ) t5
+        ORDER BY
+        t5.termNamePre,
+        t5.blockNamePre,
+        t5.unitNamePre,
+        ( SELECT num_char_extract ( t5.floor_name, 2 ) + 0 ) DESC,
+        ( SELECT num_char_extract ( t5.room_name, 2 ) + 0)
+    </select>
+
+    <select id="listHousingResourcesForCms" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
         *
         FROM