傅行帆 3 年之前
父節點
當前提交
daca598702

+ 2
- 1
src/main/java/com/yunzhi/marketing/mapper/TaBuildingMapper.java 查看文件

86
                                          @Param("isRecentOpening") Boolean isRecentOpening,
86
                                          @Param("isRecentOpening") Boolean isRecentOpening,
87
                                          @Param("isCommerce") Boolean isCommerce,
87
                                          @Param("isCommerce") Boolean isCommerce,
88
                                          @Param("marketStatus") String marketStatus,
88
                                          @Param("marketStatus") String marketStatus,
89
-                                         @Param("orderBy") String orderBy);
89
+                                         @Param("orderBy") String orderBy,
90
+                                         @Param("buildingAreaLisr") List<String> buildingAreaLisr);
90
 
91
 
91
     /**
92
     /**
92
      * 根据项目类型Id 查询
93
      * 根据项目类型Id 查询

+ 8
- 1
src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java 查看文件

907
 //
907
 //
908
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
908
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
909
 
909
 
910
+        List<String> buildingAreaLisr = new ArrayList<>();
911
+        if (!StringUtils.isEmpty(buildingArea)){
912
+            String[] split = buildingArea.split(",");
913
+            buildingAreaLisr = Arrays.asList(split);
914
+        }
915
+
910
         IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page,
916
         IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page,
911
                 name,
917
                 name,
912
                 cityId,
918
                 cityId,
922
                 isRecentOpening,
928
                 isRecentOpening,
923
                 isCommerce,
929
                 isCommerce,
924
                 marketStatus,
930
                 marketStatus,
925
-                orderBy);
931
+                orderBy,
932
+                buildingAreaLisr);
926
 
933
 
927
         List<TaBuilding> buildingList = result.getRecords();
934
         List<TaBuilding> buildingList = result.getRecords();
928
         if (CollectionUtils.isNotEmpty(buildingList)) {
935
         if (CollectionUtils.isNotEmpty(buildingList)) {

+ 4
- 1
src/main/resources/mapper/TaBuildingMapper.xml 查看文件

112
                     AND city_id = #{cityId}
112
                     AND city_id = #{cityId}
113
                 </if>
113
                 </if>
114
                 <if test="buildingArea != null">
114
                 <if test="buildingArea != null">
115
-                    AND building_area = #{buildingArea}
115
+                    AND building_area in
116
+                    <foreach collection="buildingAreaLisr" item="buildingList" open="(" close=")" separator=" OR ">
117
+                     #{buildingList}
118
+                    </foreach>
116
                 </if>
119
                 </if>
117
                 <if test="brandId != null">
120
                 <if test="brandId != null">
118
                     AND brand_id = #{brandId}
121
                     AND brand_id = #{brandId}