新需求

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

@@ -268,6 +268,7 @@ public class TaBuildingController extends BaseController {
             @RequestParam(required = false) String buildingType, // 项目类型Id
             @RequestParam(required = false) String houseType, // 户型
             @RequestParam(required = false) String price,   // 价格
+            @RequestParam(required = false) String priceType,   // 价格类型
             @RequestParam(required = false) String area,    // 面积
 //            @RequestParam(required = false) Integer minPrice, // 最低价格
 //            @RequestParam(required = false) Integer maxPrice, // 最高价格
@@ -292,7 +293,7 @@ public class TaBuildingController extends BaseController {
         List<String[]> priceList = getParamListOf(price);
         List<String[]> areaList = getParamListOf(area);
 
-        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId);
+        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId,priceType);
     }
 
 

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

@@ -77,7 +77,8 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
                                          @Param("buildingTypeList") String[] buildingTypeList,
                                          @Param("priceList") List<String[]> priceList,
                                          @Param("areaList") List<String[]> areaList,
-                                         @Param("orgId")Integer orgId);
+                                         @Param("orgId")Integer orgId,
+                                         @Param("priceType") String priceType);
 
     /**
      * 根据项目类型Id 查询

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

@@ -127,7 +127,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
             String[] buildingTypeList,
             List<String[]> priceList,
             List<String[]> areaList,
-            Integer orgId);
+            Integer orgId,String priceType);
 
     /**
      * 微信小程序 楼盘列表

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

@@ -698,7 +698,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             String[] buildingTypeList,
             List<String[]> priceList,
             List<String[]> areaList,
-            Integer orgId) {
+            Integer orgId,String priceType) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         if(CollectionUtils.isEmpty(targets) && mine){
@@ -716,7 +716,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 //
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
 
-        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId);
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId,priceType);
 
         List<TaBuilding> buildingList = result.getRecords();
         if (CollectionUtils.isNotEmpty(buildingList)) {

src/main/resources/mapper/TaBuildingMapper.xml

@@ -133,18 +133,22 @@
                         <foreach collection="priceList" item="priceArr" open="(" close=")" separator=" OR ">
                             (
                                 <if test='priceArr[0] != null and priceArr[0] != ""'>
-                                    <![CDATA[ price >= ${priceArr[0]}  ]]>
+                                    <![CDATA[ startPrice >= ${priceArr[0]}  ]]>
                                 </if>
                                 <if test='priceArr.length > 1 and priceArr[0] != null and priceArr[0] != ""'>
                                     AND
                                 </if>
                                 <if test='priceArr.length > 1 and priceArr[1] != null and priceArr[1] != ""'>
-                                    <![CDATA[ price <= ${priceArr[1]}  ]]>
+                                    <![CDATA[ endPrice <= ${priceArr[1]}  ]]>
                                 </if>
                             )
                         </foreach>
                     </if>
 
+                    <if test="priceType != null and priceType != ''">
+                        and price_type = #{priceType}
+                    </if>
+
                     <if test="buildingTypeList != null and buildingTypeList.length > 0">
                         AND building_type_id in
                         <foreach collection="buildingTypeList" item="buildingType" open="(" close=")" separator=",">