Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

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

@@ -188,7 +188,13 @@ public class TaBuildingController extends BaseController {
             @RequestParam(defaultValue = "10")Integer pageSize,
             @RequestParam(defaultValue = "false") Boolean mine,
             @RequestParam(required = false) Integer cityId,
-            String name,
+            @RequestParam(required = false) String name,
+            @RequestParam(required = false) String houseType, // 户型
+            @RequestParam(required = false) Integer buildingTypeId, // 项目类型Id
+            @RequestParam(required = false) Integer minPrice, // 最低价格
+            @RequestParam(required = false) Integer maxPrice, // 最高价格
+            @RequestParam(required = false) Double minBuildingArea, // 最小面积
+            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
             HttpServletRequest request
     ){
         List<String> targets = null;
@@ -202,7 +208,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, houseType, buildingTypeId, minPrice, maxPrice, minBuildingArea, maxBuildingArea);
     }
 
     /**

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

@@ -50,6 +50,7 @@ public class TdBuildingTypeController extends BaseController {
             //使用分页插件
 		    IPage<TdBuildingType> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", 1);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TdBuildingType> result = iTdBuildingTypeService.page(pg, queryWrapper);
@@ -61,6 +62,33 @@ public class TdBuildingTypeController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/tdBuildingType",method= RequestMethod.GET)
+    public ResponseBean tdWxBuildingTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TdBuildingType> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", 1);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TdBuildingType> result = iTdBuildingTypeService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("tdBuildingTypeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
     /**
      * 保存对象
      * @param tdBuildingType 实体对象

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

@@ -1,87 +1,87 @@
-package com.huiju.estateagents.entity;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 项目户型表
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class TaBuildingApartment implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 户型id
-     */
-    @TableId(value = "apartment_id", type = IdType.UUID)
-    private String apartmentId;
-
-    /**
-     * 楼盘id
-     */
-    private String buildingId;
-
-    /**
-     * 名称
-     */
-    private String apartmentName;
-
-    /**
-     * 类型
-     */
-    private String apartmentType;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 状态
-     */
-    private Integer status;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createDate;
-
-    /**
-     * 销售状态
-     */
-    private Integer marketStatus;
-
-    private String insideArea;
-
-    private String buildingArea;
-
-    private String apartmentPrice;
-
-    private String apartmentDescription;
-
-    private String houseType;
-
-    /**
-     * 户型图片列表
-     */
-    @TableField(exist = false)
-    private List<TaBuildingImg> buildingImgList;
-
-
-}
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 项目户型表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaBuildingApartment implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 户型id
+     */
+    @TableId(value = "apartment_id", type = IdType.UUID)
+    private String apartmentId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 名称
+     */
+    private String apartmentName;
+
+    /**
+     * 类型
+     */
+    private String apartmentType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 销售状态
+     */
+    private Integer marketStatus;
+
+    private Double insideArea;
+
+    private Double buildingArea;
+
+    private String apartmentPrice;
+
+    private String apartmentDescription;
+
+    private String houseType;
+
+    /**
+     * 户型图片列表
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> buildingImgList;
+
+
+}

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

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

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 houseType, Integer buildingTypeId, Integer minPrice, Integer maxPrice, Double minBuildingArea, Double maxBuildingArea);
 
     /**
      * 微信小程序 楼盘列表

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 houseType, Integer buildingTypeId, Integer minPrice, Integer maxPrice, Double minBuildingArea, Double maxBuildingArea) {
         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, houseType,buildingTypeId, minPrice, maxPrice, minBuildingArea, maxBuildingArea);
 
         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,69 @@
         from ta_building
     </select>
 
+    <select id="selectBuildingPage" resultType="com.huiju.estateagents.entity.TaBuilding">
+      SELECT
+            tb.*
+        FROM
+            (
+             select * from  ta_building
+                WHERE
+                `status` = 1
+                <if test="cityId != null">
+                    AND city_id = #{cityId}
+                </if>
+                <if test="buildingTypeId != null">
+                    AND building_type = #{buildingTypeId}
+                </if>
+                <if test="targets != null">
+                    AND building_id IN (#{targets})
+                </if>
+                <if test="name != null and name !=''">
+                    AND `name` LIKE CONCAT('%',#{name},'%')
+                    OR `building_name` LIKE CONCAT('%',#{name},'%')
+                </if>
+            ) as tb
+
+            <if test="minPrice != null or maxPrice != null or buildingTypeId != null">
+                INNER JOIN
+                (
+                SELECT * FROM ta_building_project_type
+                <trim prefix="where" prefixOverrides="and | or">
+                    <if test="minPrice != null and maxPrice != null">
+                        and price BETWEEN #{minPrice} AND #{maxPrice}
+                    </if>
+                    <if test="minPrice != null and maxPrice == null">
+                        <![CDATA[  and price >= #{minPrice}  ]]>
+                    </if>
+                    <if test="minPrice == null and maxPrice != null">
+                        <![CDATA[  and price <= #{maxPrice}  ]]>
+                    </if>
+                    <if test="buildingTypeId != null">
+                        AND building_type_id = #{buildingTypeId}
+                    </if>
+                </trim>
+                GROUP BY building_id
+                )
+                AS tbpt ON tb.building_id = tbpt.building_id
+            </if>
+
+            <if test="minBuildingArea != null or maxBuildingArea != null or (houseType != null and houseType != '')">
+                INNER JOIN
+                (
+                SELECT * FROM ta_building_apartment
+                <trim prefix="where" prefixOverrides="and | or">
+                    <if test="minBuildingArea != null and maxBuildingArea != null">
+                        and building_area BETWEEN #{minBuildingArea} AND #{maxBuildingArea}
+                    </if>
+                    <if test="houseType != null and houseType != ''">
+                        AND house_type = #{houseType}
+                    </if>
+                </trim>
+                GROUP BY building_id
+                ) as tba ON tb.building_id = tba.building_id
+            </if>
+
+            ORDER BY tb.order_no DESC
+    </select>
+
 </mapper>