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

# Conflicts:
#	src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

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

      * @param pageSize     分页大小
      * @param salesBatchId 销售批次ID
      * @return
+     * @author gushaoyong
      */
-    @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.POST)
+    @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
     public ResponseBean listHousingResources(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                              @RequestParam(value = "salesBatchId") String salesBatchId,
      *
      * @param salesBatchId
      * @return
+     * @author gushaoyong
      */
-    @RequestMapping(value = "/wx/listBuildApartmentBySalesBatchId", method = RequestMethod.POST)
+    @RequestMapping(value = "/wx/listBuildApartmentBySalesBatchId", method = RequestMethod.GET)
     public ResponseBean listBuildApartmentBySalesBatchId(@RequestParam(value = "salesBatchId") String salesBatchId) {
         ResponseBean responseBean = new ResponseBean();
         try {
      *
      * @param houseId
      * @return
+     * @author gushaoyong
      */
-    @RequestMapping(value = "/wx/getHousingDetailById", method = RequestMethod.POST)
+    @RequestMapping(value = "/wx/getHousingDetailById", method = RequestMethod.GET)
     public ResponseBean getHousingDetailById(@RequestParam(value = "houseId") String houseId,
                                              @RequestParam(value = "personId") String personId) {
         ResponseBean responseBean = new ResponseBean();

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

      * @param pageNum
      * @param pageSize
      * @return
+     * @author gushaoyong
      */
     @RequestMapping(value = "/taPreselectionRecord", method = RequestMethod.GET)
     public ResponseBean taPreselectionRecordList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
      *
      * @param taPreselectionRecord 实体对象
      * @return
+     * @author gushaoyong
      */
     @RequestMapping(value = "/taPreselectionRecord", method = RequestMethod.POST)
     public ResponseBean taPreselectionRecordAdd(@RequestBody TaPreselectionRecord taPreselectionRecord) {
         try {
             responseBean.addSuccess(iTaPreselectionRecordService.taPreselectionRecordCancel(personId, houseId));
         } catch (Exception e) {
-            logger.error("taPreselectionRecordCancel -=- {}", e.toString());
+            logger.error("taPreselectionRecordCancel -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
      * @param pageSize 分页大小
      * @param personId 用户ID
      * @return
+     * @author gushaoyong
      */
-    @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.POST)
+    @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.GET)
     public ResponseBean listPreselectionRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                @RequestParam("personId") String personId) {
         try {
             responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNum, pageSize, personId));
         } catch (Exception e) {
-            logger.error("listPreselectionRecord -=- {}", e.toString());
+            logger.error("listPreselectionRecord -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
      * @param personId 用户ID
      * @param houseId  房源ID
      * @return
+     * @author gushaoyong
      */
     @RequestMapping(value = "/wx/checkPreselect", method = RequestMethod.POST)
     public ResponseBean checkPreselect(@RequestParam("personId") String personId,
         try {
             responseBean.addSuccess(iTaPreselectionRecordService.checkPreselect(personId, houseId));
         } catch (Exception e) {
-            logger.error("checkPreselect -=- {}", e.toString());
+            logger.error("checkPreselect -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

 package com.huiju.estateagents.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.huiju.estateagents.entity.TaBuildingImg;
 import com.huiju.estateagents.entity.TaHousingResources;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @Auther: gusy
     private Double buildingArea;
 
     /**
-     * 是否预选已经预选，1 是 0 否
+     * 是否已经预选该房源，true 是 false 否
      */
     @TableField(exist = false)
     private Boolean isPreselect;
      * 销售批次状态
      */
     private Integer saleBatchStatus;
+
+    /**
+     * 户型图片列表
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> buildingImgList;
 }

src/main/java/com/huiju/estateagents/po/TaPreselectionRecordPO.java

 package com.huiju.estateagents.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.huiju.estateagents.entity.TaBuildingImg;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @Auther: gusy
  * @Date: 2020/2/11 15:16
      * 价格
      */
     private String price;
+
+    /**
+     * 户型id
+     */
+    private String apartmentId;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
+    /**
+     * 户型图片列表
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> buildingImgList;
 }

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

 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.mapper.TaApartmentImgMapper;
+import com.huiju.estateagents.mapper.TaBuildingImgMapper;
+import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
+import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
     @Autowired
     private TaPreselectionRecordMapper taPreselectionRecordMapper;
 
+    @Autowired
+    TaBuildingImgMapper taBuildingImgMapper;
+
+    @Autowired
+    TaApartmentImgMapper taApartmentImgMapper;
+
 
     /**
      * 分页获取房源列表
     public List<TaBuildingApartment> listBuildApartmentBySalesBatchId(String salesBatchId) {
         logger.info("listBuildApartmentBySalesBatchId 接收参数：salesBatchId：{}", salesBatchId);
 
-        return taHousingResourcesMapper.listBuildApartmentBySalesBatchId(salesBatchId);
+        // 获取户型列表
+        List<TaBuildingApartment> apartmentList = taHousingResourcesMapper.listBuildApartmentBySalesBatchId(salesBatchId);
+        if (CollectionUtils.isEmpty(apartmentList)) {
+            return null;
+        }
+
+        // 组装户型图片
+        List<TaBuildingApartment> resultList = new ArrayList<>();
+        List<TaBuildingImg> taBuildingImgList;
+        List<TaApartmentImg> buildingImg;
+        QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper;
+        QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
+        for (TaBuildingApartment apartment : apartmentList) {
+            apartmentImgQueryWrapper = new QueryWrapper<>();
+            apartmentImgQueryWrapper.eq("apartment_id", apartment.getApartmentId());
+            buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+            for (TaApartmentImg apartmentImg : buildingImg) {
+                buildingImgQueryWrapper = new QueryWrapper<>();
+                buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+                buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+                apartment.setBuildingImgList(taBuildingImgList);
+                resultList.add(apartment);
+            }
+        }
+        return resultList;
     }
 
     /**
     public TaHousingResourcesPO getHousingDetailById(String personId, String houseId) {
         logger.info("getHousingDetailById 接收参数：personId：{}，houseId：{}", personId, houseId);
 
-        return taHousingResourcesMapper.getHousingDetailById(houseId, "1");
+        // 查询房源详情
+        TaHousingResourcesPO resourcesPO = taHousingResourcesMapper.getHousingDetailById(houseId, "1");
+        if (resourcesPO == null) {
+            return null;
+        }
+
+        // 获取该用户是否预选房源信息
+        TaPreselectionRecord taPreselectionRecord = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
+        if (taPreselectionRecord == null) {
+            resourcesPO.setIsPreselect(false);
+        } else {
+            resourcesPO.setIsPreselect(true);
+        }
+
+        // 获取户型图片列表
+        List<TaBuildingImg> taBuildingImgList = new ArrayList<>();
+        List<TaApartmentImg> buildingImg;
+        QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
+        QueryWrapper<TaApartmentImg>  apartmentImgQueryWrapper = new QueryWrapper<>();
+        apartmentImgQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
+        buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+        for (TaApartmentImg apartmentImg : buildingImg) {
+            buildingImgQueryWrapper = new QueryWrapper<>();
+            buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+            buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+            taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+        }
+        if(CollectionUtils.isNotEmpty(taBuildingImgList)){
+            resourcesPO.setBuildingImgList(taBuildingImgList);
+        }
+
+        return resourcesPO;
     }
 
     /**

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

 package com.huiju.estateagents.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.entity.TaApartmentImg;
+import com.huiju.estateagents.entity.TaBuildingImg;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
+import com.huiju.estateagents.mapper.TaApartmentImgMapper;
+import com.huiju.estateagents.mapper.TaBuildingImgMapper;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
     @Autowired
     private TaHousingResourcesMapper taHousingResourcesMapper;
 
+    @Autowired
+    TaBuildingImgMapper taBuildingImgMapper;
+
+    @Autowired
+    TaApartmentImgMapper taApartmentImgMapper;
+
     @Override
     public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, String personId) {
         logger.info("listPreselectionRecord 接收参数：pageNum：{}，pageSize：{}，personId：{}", pageNum, pageSize, personId);
 
         IPage<TaPreselectionRecordPO> iPage = new Page<>(pageNum, pageSize);
-        return taPreselectionRecordMapper.listPreselectionRecord(iPage, personId);
+        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, personId);
+
+        List<TaPreselectionRecordPO> poList = iPage.getRecords();
+        if (CollectionUtils.isNotEmpty(poList)) {
+            List<TaPreselectionRecordPO> resultList = new ArrayList<>();
+            List<TaBuildingImg> taBuildingImgList;
+            List<TaApartmentImg> buildingImg;
+            QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper;
+            QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
+            for (TaPreselectionRecordPO po : poList) {
+                apartmentImgQueryWrapper = new QueryWrapper<>();
+                apartmentImgQueryWrapper.eq("apartment_id", po.getApartmentId());
+                buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+                for (TaApartmentImg apartmentImg : buildingImg) {
+                    buildingImgQueryWrapper = new QueryWrapper<>();
+                    buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+                    buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                    taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+                    po.setBuildingImgList(taBuildingImgList);
+                    resultList.add(po);
+                }
+            }
+            iPage.setRecords(resultList);
+        }
+        return iPage;
     }
 
     @Override
         }
 
         // 校验预选操作时间是否在规定范围内
-        if (DateUtils.checkTimeRange(resourcesPO.getPreselectionStartTime(), resourcesPO.getPreselectionEndTime(), null)) {
+        if (!DateUtils.checkTimeRange(resourcesPO.getPreselectionStartTime(), resourcesPO.getPreselectionEndTime(), null)) {
             responseBean.addError("当前时间不在预选时间范围内，请联系置业顾问了解详情。");
             return responseBean;
         }

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

                         and tade.phone like CONCAT('%',#{phone}, '%')
                     </if>
                 </where>
-
+            GROUP BY tade.person_id
 
         </select>
 

src/main/resources/mapper/TaHousingResourcesMapper.xml

 
     <select id="listHousingResources" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
-        t.house_id,
-        t.building_id,
-        t.block_id,
-        t.block_name,
-        t.sales_batch_id,
-        t.unit_id,
-        t.unit_name,
-        t.floor_id,
-        t.floor_name,
-        t.room_id,
-        t.room_name,
-        t.price,
-        t.heat,
-        t.apartment_id,
-        t.`status`,
-        t.org_id,
-        t2.inside_area,
-        t2.building_area
+            t.house_id,
+            t.building_id,
+            t.block_id,
+            t.block_name,
+            t.sales_batch_id,
+            t.unit_id,
+            t.unit_name,
+            t.floor_id,
+            t.floor_name,
+            t.room_id,
+            t.room_name,
+            t.price,
+            t.heat,
+            t.apartment_id,
+            t.`status`,
+            t.org_id,
+            t2.inside_area,
+            t2.building_area,
+            t2.apartment_name
         FROM
-        ta_housing_resources t,
-        ta_building_apartment t2
+            ta_housing_resources t,
+            ta_building_apartment t2
         WHERE
-        t.sales_batch_id = #{salesBatchId}
+            t.sales_batch_id = #{salesBatchId}
         <if test="startPrice != null and startPrice != '' and endPrice != null and endPrice != ''">
             AND ( t.price BETWEEN #{startPrice} AND #{endPrice} )
         </if>
         AND t.apartment_id = t2.apartment_id
         AND t.`status` = 1
         AND t2.`status` = 1
-        ORDER BY
-        t.create_date DESC
+        ORDER BY t.create_date DESC
     </select>
 
     <select id="listBuildApartmentBySalesBatchId" resultType="com.huiju.estateagents.entity.TaBuildingApartment">

src/main/resources/mapper/TaPreselectionRecordMapper.xml

 <mapper namespace="com.huiju.estateagents.mapper.TaPreselectionRecordMapper">
 
     <select id="listPreselectionRecord" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
+        SELECT
+            t3.*,
+            t4.building_name
+        FROM
+            (
         SELECT
             t.*,
             t2.block_name,
             t2.unit_name,
             t2.floor_name,
             t2.room_name,
-            t2.price
+            t2.price,
+            t2.apartment_id,
+            t2.building_id buildingId
         FROM
-            ta_preselection_record t ,
+            ta_preselection_record t,
             ta_housing_resources t2
         WHERE
-            t.person_id = #{persionId}
-            and t.house_id = t2.house_id
+            t.person_id = #{personId}
+            AND t.house_id = t2.house_id
         ORDER BY
-            t.create_date DESC;
+            t.create_date DESC
+            ) t3
+            LEFT JOIN ta_building t4 ON t3.buildingId = t4.building_id
     </select>
 
     <select id="getRecordByPersonIdAndHouseId" resultType="com.huiju.estateagents.entity.TaPreselectionRecord">