顾绍勇 5 gadus atpakaļ
vecāks
revīzija
5cf81ac6e2

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java Parādīt failu

225
                 orgId, salesBatchId, startPrice, endPrice, apartmentId);
225
                 orgId, salesBatchId, startPrice, endPrice, apartmentId);
226
 
226
 
227
         try {
227
         try {
228
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId));
228
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, 1));
229
         } catch (Exception e) {
229
         } catch (Exception e) {
230
             logger.error("listHousingResources -=- {}", e);
230
             logger.error("listHousingResources -=- {}", e);
231
             responseBean.addError(e.getMessage());
231
             responseBean.addError(e.getMessage());
247
         Integer orgId = getOrgId(request);
247
         Integer orgId = getOrgId(request);
248
 
248
 
249
         try {
249
         try {
250
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, "", "", ""));
250
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, "", "", "", 0));
251
         } catch (Exception e) {
251
         } catch (Exception e) {
252
             logger.error("listHousingResourcesFormCms -=- {}", e);
252
             logger.error("listHousingResourcesFormCms -=- {}", e);
253
             responseBean.addError(e.getMessage());
253
             responseBean.addError(e.getMessage());

+ 11
- 8
src/main/java/com/huiju/estateagents/mapper/TaHousingResourcesMapper.java Parādīt failu

30
      * @param startPrice
30
      * @param startPrice
31
      * @param endPrice
31
      * @param endPrice
32
      * @param apartmentId
32
      * @param apartmentId
33
+     * @param type         为1只展示已发布的房源
33
      * @return
34
      * @return
34
      */
35
      */
35
     List<TaHousingResourcesPO> listHousingResources(@Param("orgId") Integer orgId,
36
     List<TaHousingResourcesPO> listHousingResources(@Param("orgId") Integer orgId,
36
-                                                     @Param("salesBatchId") String salesBatchId,
37
-                                                     @Param("startPrice") String startPrice,
38
-                                                     @Param("endPrice") String endPrice,
39
-                                                     @Param("apartmentId") String apartmentId);
37
+                                                    @Param("salesBatchId") String salesBatchId,
38
+                                                    @Param("startPrice") String startPrice,
39
+                                                    @Param("endPrice") String endPrice,
40
+                                                    @Param("apartmentId") String apartmentId,
41
+                                                    @Param("type") Integer type);
40
 
42
 
41
     /**
43
     /**
42
      * 获取某销售批次下所有房源户型
44
      * 获取某销售批次下所有房源户型
74
 
76
 
75
     /**
77
     /**
76
      * 分页获取数据
78
      * 分页获取数据
79
+     *
77
      * @param pg
80
      * @param pg
78
      * @param salesBatchId
81
      * @param salesBatchId
79
      * @param buildingId
82
      * @param buildingId
88
      * @param houseId
91
      * @param houseId
89
      * @return
92
      * @return
90
      */
93
      */
91
-    IPage<TaHousingResources> getHouseResourceList(IPage<TaHousingResources> pg,@Param("salesBatchId") Integer salesBatchId,@Param("buildingId") String buildingId,
92
-                                                   @Param("orgId") Integer orgId,@Param("termName") String termName,@Param("blockName") String blockName,
93
-                                                   @Param("unitName") String unitName,@Param("floorName") String floorName,@Param("roomName") String roomName,
94
-                                                   @Param("apartmentId") String apartmentId,@Param("status") Integer status,@Param("houseId") String houseId);
94
+    IPage<TaHousingResources> getHouseResourceList(IPage<TaHousingResources> pg, @Param("salesBatchId") Integer salesBatchId, @Param("buildingId") String buildingId,
95
+                                                   @Param("orgId") Integer orgId, @Param("termName") String termName, @Param("blockName") String blockName,
96
+                                                   @Param("unitName") String unitName, @Param("floorName") String floorName, @Param("roomName") String roomName,
97
+                                                   @Param("apartmentId") String apartmentId, @Param("status") Integer status, @Param("houseId") String houseId);
95
 }
98
 }

+ 3
- 1
src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java Parādīt failu

26
      * @param startPrice
26
      * @param startPrice
27
      * @param endPrice
27
      * @param endPrice
28
      * @param apartmentId
28
      * @param apartmentId
29
+     * @param type  为1只展示已发布的房源
29
      * @return
30
      * @return
30
      */
31
      */
31
-    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId);
32
+    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, Integer type);
32
 
33
 
33
     /**
34
     /**
34
      * 获取某销售批次下所有房源户型
35
      * 获取某销售批次下所有房源户型
104
 
105
 
105
     /**
106
     /**
106
      * 保存文件
107
      * 保存文件
108
+     *
107
      * @param file
109
      * @param file
108
      * @param salesBatchId
110
      * @param salesBatchId
109
      * @param buildingId
111
      * @param buildingId

+ 5
- 4
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java Parādīt failu

87
      * @param startPrice
87
      * @param startPrice
88
      * @param endPrice
88
      * @param endPrice
89
      * @param apartmentId
89
      * @param apartmentId
90
+     * @param type
90
      * @return
91
      * @return
91
      */
92
      */
92
     @Override
93
     @Override
93
-    public List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId) {
94
-        logger.info("listHousingResources 接收参数:orgId:{},salesBatchId:{},startPrice:{},endPrice:{},apartmentId:{}",
95
-                orgId, salesBatchId, startPrice, endPrice, apartmentId);
94
+    public List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, Integer type) {
95
+        logger.info("listHousingResources 接收参数:orgId:{},salesBatchId:{},startPrice:{},endPrice:{},apartmentId:{},type:{}",
96
+                orgId, salesBatchId, startPrice, endPrice, apartmentId, type);
96
 
97
 
97
         startPrice = StringUtils.isEmpty(startPrice) ? null : startPrice;
98
         startPrice = StringUtils.isEmpty(startPrice) ? null : startPrice;
98
         endPrice = StringUtils.isEmpty(endPrice) ? null : endPrice;
99
         endPrice = StringUtils.isEmpty(endPrice) ? null : endPrice;
99
 
100
 
100
         List<TaHousingResourcesPO> resourcesPOList =
101
         List<TaHousingResourcesPO> resourcesPOList =
101
-                taHousingResourcesMapper.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId);
102
+                taHousingResourcesMapper.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, type);
102
 
103
 
103
         return resourcesPOList;
104
         return resourcesPOList;
104
     }
105
     }

+ 10
- 2
src/main/resources/mapper/TaHousingResourcesMapper.xml Parādīt failu

54
         LEFT JOIN ta_building_block t3 ON t.block_id = t3.block_id
54
         LEFT JOIN ta_building_block t3 ON t.block_id = t3.block_id
55
         WHERE
55
         WHERE
56
             t.sales_batch_id = #{salesBatchId}
56
             t.sales_batch_id = #{salesBatchId}
57
+            AND t.org_id = #{orgId}
57
             <choose>
58
             <choose>
58
                 <when test=" endPrice != null and startPrice == null">
59
                 <when test=" endPrice != null and startPrice == null">
59
                     AND t.price &lt;= #{endPrice}
60
                     AND t.price &lt;= #{endPrice}
70
             <if test="apartmentId != null and apartmentId != ''">
71
             <if test="apartmentId != null and apartmentId != ''">
71
                 AND t.apartment_id = #{apartmentId}
72
                 AND t.apartment_id = #{apartmentId}
72
             </if>
73
             </if>
73
-            AND t.org_id = #{orgId}
74
-            AND t.`status` > 0
74
+            <choose>
75
+                <when test="type == 1">
76
+                    AND t.`status` > 0
77
+                </when>
78
+                <otherwise>
79
+                    AND t.`status` > -1
80
+                </otherwise>
81
+            </choose>
82
+
75
           ) t5
83
           ) t5
76
         ORDER BY
84
         ORDER BY
77
             t5.termNamePre,
85
             t5.termNamePre,