傅行帆 5 anni fa
parent
commit
102ed37922

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java Vedi File

268
             @RequestParam(required = false) String buildingType, // 项目类型Id
268
             @RequestParam(required = false) String buildingType, // 项目类型Id
269
             @RequestParam(required = false) String houseType, // 户型
269
             @RequestParam(required = false) String houseType, // 户型
270
             @RequestParam(required = false) String price,   // 价格
270
             @RequestParam(required = false) String price,   // 价格
271
+            @RequestParam(required = false) String priceType,   // 价格类型
271
             @RequestParam(required = false) String area,    // 面积
272
             @RequestParam(required = false) String area,    // 面积
272
 //            @RequestParam(required = false) Integer minPrice, // 最低价格
273
 //            @RequestParam(required = false) Integer minPrice, // 最低价格
273
 //            @RequestParam(required = false) Integer maxPrice, // 最高价格
274
 //            @RequestParam(required = false) Integer maxPrice, // 最高价格
292
         List<String[]> priceList = getParamListOf(price);
293
         List<String[]> priceList = getParamListOf(price);
293
         List<String[]> areaList = getParamListOf(area);
294
         List<String[]> areaList = getParamListOf(area);
294
 
295
 
295
-        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId);
296
+        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId,priceType);
296
     }
297
     }
297
 
298
 
298
 
299
 

+ 2
- 1
src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java Vedi File

77
                                          @Param("buildingTypeList") String[] buildingTypeList,
77
                                          @Param("buildingTypeList") String[] buildingTypeList,
78
                                          @Param("priceList") List<String[]> priceList,
78
                                          @Param("priceList") List<String[]> priceList,
79
                                          @Param("areaList") List<String[]> areaList,
79
                                          @Param("areaList") List<String[]> areaList,
80
-                                         @Param("orgId")Integer orgId);
80
+                                         @Param("orgId")Integer orgId,
81
+                                         @Param("priceType") String priceType);
81
 
82
 
82
     /**
83
     /**
83
      * 根据项目类型Id 查询
84
      * 根据项目类型Id 查询

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingService.java Vedi File

127
             String[] buildingTypeList,
127
             String[] buildingTypeList,
128
             List<String[]> priceList,
128
             List<String[]> priceList,
129
             List<String[]> areaList,
129
             List<String[]> areaList,
130
-            Integer orgId);
130
+            Integer orgId,String priceType);
131
 
131
 
132
     /**
132
     /**
133
      * 微信小程序 楼盘列表
133
      * 微信小程序 楼盘列表

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Vedi File

698
             String[] buildingTypeList,
698
             String[] buildingTypeList,
699
             List<String[]> priceList,
699
             List<String[]> priceList,
700
             List<String[]> areaList,
700
             List<String[]> areaList,
701
-            Integer orgId) {
701
+            Integer orgId,String priceType) {
702
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
702
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
703
 
703
 
704
         if(CollectionUtils.isEmpty(targets) && mine){
704
         if(CollectionUtils.isEmpty(targets) && mine){
716
 //
716
 //
717
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
717
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
718
 
718
 
719
-        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId);
719
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId,priceType);
720
 
720
 
721
         List<TaBuilding> buildingList = result.getRecords();
721
         List<TaBuilding> buildingList = result.getRecords();
722
         if (CollectionUtils.isNotEmpty(buildingList)) {
722
         if (CollectionUtils.isNotEmpty(buildingList)) {

+ 6
- 2
src/main/resources/mapper/TaBuildingMapper.xml Vedi File

133
                         <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
133
                         <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
134
                             (
134
                             (
135
                                 <if test='priceArr[0] != null and priceArr[0] != ""'>
135
                                 <if test='priceArr[0] != null and priceArr[0] != ""'>
136
-                                    <![CDATA[ price >= ${priceArr[0]}  ]]>
136
+                                    <![CDATA[ startPrice >= ${priceArr[0]}  ]]>
137
                                 </if>
137
                                 </if>
138
                                 <if test='priceArr.length > 1 and priceArr[0] != null and priceArr[0] != ""'>
138
                                 <if test='priceArr.length > 1 and priceArr[0] != null and priceArr[0] != ""'>
139
                                     AND
139
                                     AND
140
                                 </if>
140
                                 </if>
141
                                 <if test='priceArr.length > 1 and priceArr[1] != null and priceArr[1] != ""'>
141
                                 <if test='priceArr.length > 1 and priceArr[1] != null and priceArr[1] != ""'>
142
-                                    <![CDATA[ price <= ${priceArr[1]}  ]]>
142
+                                    <![CDATA[ endPrice <= ${priceArr[1]}  ]]>
143
                                 </if>
143
                                 </if>
144
                             )
144
                             )
145
                         </foreach>
145
                         </foreach>
146
                     </if>
146
                     </if>
147
 
147
 
148
+                    <if test="priceType != null and priceType != ''">
149
+                        and price_type = #{priceType}
150
+                    </if>
151
+
148
                     <if test="buildingTypeList != null and buildingTypeList.length > 0">
152
                     <if test="buildingTypeList != null and buildingTypeList.length > 0">
149
                         AND building_type_id in
153
                         AND building_type_id in
150
                         <foreach collection="buildingTypeList" item="buildingType" open="(" close=")" separator=",">
154
                         <foreach collection="buildingTypeList" item="buildingType" open="(" close=")" separator=",">