* 代码优化

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

         Integer orgId = getOrgId(request);
         String personId = getPersonId(request);
 
-        logger.info("TaHouseingResourcesController.listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}",
-                orgId, salesBatchId, startPrice, endPrice, apartmentId);
+        logger.info("TaHouseingResourcesController.listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{},source:{}",
+                orgId, salesBatchId, startPrice, endPrice, apartmentId, source);
 
         try {
             //获取所有楼房的预选热度和认筹热度
      * @return
      */
     @RequestMapping(value = "/admin/house/updateLockingStatus", method = RequestMethod.PUT)
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId,Integer raiseRecordId,
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId, Integer raiseRecordId,
                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
      * @return
      */
     @RequestMapping(value = "/wx/check/raise", method = RequestMethod.GET)
-    public ResponseBean checkRaise(@RequestParam(value = "houseId") Integer houseId,HttpServletRequest request) {
+    public ResponseBean checkRaise(@RequestParam(value = "houseId") Integer houseId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            boolean state = iTaHousingResourcesService.checkRaiseState(houseId,getPersonId(request),getOrgId(request));
+            boolean state = iTaHousingResourcesService.checkRaiseState(houseId, getPersonId(request), getOrgId(request));
             responseBean.addSuccess(state);
         } catch (Exception e) {
             logger.error("校验房源状态 -=- {}", e.getMessage());

src/main/resources/mapper/TaHousingResourcesMapper.xml

         FROM
         (
         SELECT
-        t.house_id,
+        t.*,
         (
         CASE
         WHEN ( SELECT num_char_extract ( t.term_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
+        t2.apartment_name
         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
+            LEFT JOIN ta_raise t7 ON t.sales_batch_id = t7.sales_batch_id
         </if>
         WHERE
-        t.sales_batch_id = #{salesBatchId}
-        AND t.org_id = #{orgId}
-        AND t.`status` > 0
-        AND t4.`status` = 1
+            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 )
+            AND (t.house_locking_status  != 'locked' OR t.house_locking_status IS NULL)
+            AND t7.raise_start_time &lt;= now( ) AND t7.raise_end_time &gt;= now()
             <if test="personId != null and personId != ''">
-                AND t6.person_id != #{personId}
+                AND (t6.person_id != #{personId} OR t6.person_id IS NULL)
             </if>
-            AND (t.house_locking_status  != 'locked'
-            OR t.house_locking_status IS NULL)
         </if>
         <choose>
             <when test=" endPrice != null and startPrice == null">