楼盘查询 暂存

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

@@ -188,7 +188,9 @@ public class TaBuildingController extends BaseController {
             @RequestParam(defaultValue = "10")Integer pageSize,
             @RequestParam(defaultValue = "false") Boolean mine,
             @RequestParam(required = false) Integer cityId,
-            String name,
+            @RequestParam String name,
+            @RequestParam String apartmentId, // 户型Id
+            @RequestParam Integer buildingTypeId, // 项目类型Id
             HttpServletRequest request
     ){
         List<String> targets = null;
@@ -202,7 +204,7 @@ public class TaBuildingController extends BaseController {
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_PROJECT);
         }
 
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine);
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, apartmentId, buildingTypeId);
     }
 
     /**

src/main/java/com/huiju/estateagents/entity/TaBuildingApartment.java

@@ -67,9 +67,9 @@ public class TaBuildingApartment implements Serializable {
      */
     private Integer marketStatus;
 
-    private String insideArea;
+    private Double insideArea;
 
-    private String buildingArea;
+    private Double buildingArea;
 
     private String apartmentPrice;
 

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

@@ -55,4 +55,17 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @return
      */
     Map<String, Object> selectBuildingStatistical(@Param("saveOrShare") String saveOrShare);
+
+    /**
+     * 查询楼盘
+     * @param page
+     * @param name
+     * @param cityId
+     * @param targets
+     * @param doorModel
+     * @param buildingTypeId
+     * @return
+     */
+    IPage<TaBuilding> selectBuildingPage(IPage<TaBuilding> page, @Param("name") String name, @Param("cityId") Integer cityId, @Param("targets") List<String> targets, @Param("doorModel") String doorModel, @Param("buildingTypeId") Integer buildingTypeId);
+
 }

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

@@ -117,7 +117,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @param name
      */
-    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId,boolean mine);
+    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId,boolean mine, String apartmentId, Integer buildingTypeId);
 
     /**
      * 微信小程序 楼盘列表

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

@@ -374,26 +374,29 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId,boolean mine) {
+    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId,boolean mine, String doorModel, Integer buildingTypeId) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
-        QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
-        buildingQueryWrapper.nested(null != name && !"".equals(name.trim()), i -> i.like("name", name).or().like("building_name", name));
-        buildingQueryWrapper.eq("status", 1);
-        buildingQueryWrapper.eq(null != cityId && cityId != 0,"city_id", cityId);
-        buildingQueryWrapper.in(null != targets && targets.size() > 0, "building_id", targets);
-//        buildingQueryWrapper.like(null != name && !"".equals(name.trim()), "name", name);
-        buildingQueryWrapper.orderByAsc("order_no");
+//        QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
+//        buildingQueryWrapper.nested(null != name && !"".equals(name.trim()), i -> i.like("name", name).or().like("building_name", name));
+//        buildingQueryWrapper.eq("status", 1);
+//        buildingQueryWrapper.eq(null != cityId && cityId != 0,"city_id", cityId);
+//        buildingQueryWrapper.in(null != targets && targets.size() > 0, "building_id", targets);
+////        buildingQueryWrapper.like(null != name && !"".equals(name.trim()), "name", name);
+//        buildingQueryWrapper.orderByAsc("order_no");
+//        buildingQueryWrapper.eq(null != buildingTypeId,"building_type", buildingTypeId);
+//
+//        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
 
-        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, doorModel,buildingTypeId);
 
         List<TaBuilding> buildingList = result.getRecords();
-        if (null != buildingList && buildingList.size() > 0) {
+        if (CollectionUtils.isNotEmpty(buildingList)) {
             for (TaBuilding build:buildingList) {
                 getBuildingAttaches(build);
             }
         }
-        if(null!=targets&&targets.size()<=0 && mine){
+        if(CollectionUtils.isEmpty(targets) && mine){
             return ResponseBean.success(null);
         }else {
             return ResponseBean.success(result);

src/main/resources/mapper/TaBuildingMapper.xml

@@ -78,4 +78,8 @@
         from ta_building
     </select>
 
+    <select id="selectBuildingPage">
+
+    </select>
+
 </mapper>