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

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

@@ -12,6 +12,7 @@ import com.huiju.estateagents.entity.TaPreselection;
 import com.huiju.estateagents.entity.TaSalesBatch;
 import com.huiju.estateagents.service.ITaPreselectionService;
 import com.huiju.estateagents.service.impl.TaSalesBatchServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +43,7 @@ public class TaPreselectionController extends BaseController {
     private TaSalesBatchServiceImpl taSalesBatchService;
 
     /**
-     * 获取销售批次列表-预选
+     * 条件查询预选列表
      *
      * @param pageNum
      * @param pageSize
@@ -52,18 +53,18 @@ public class TaPreselectionController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/admin/listSalesBatchForPreselect", method = RequestMethod.GET)
-    public ResponseBean listSalesBatchForPreselect(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                   String buildingId, String salesBatchName, Integer status,
-                                                   HttpServletRequest request) {
+    @RequestMapping(value = "/admin/listPresecretByCondition", method = RequestMethod.GET)
+    public ResponseBean listPresecretByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                 String buildingId, String salesBatchName, Integer status,
+                                                 HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
 
         try {
             Integer orgId = getOrgId(request);
             List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
 
-            responseBean = taSalesBatchService.listSalesBatchForPreselect(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
+            responseBean = iTaPreselectionService.listPresecretByCondition(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
             logger.info("listSalesBatchForPreselect 返回结果：{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("listSalesBatchForPreselect -=- {}", e);
@@ -209,9 +210,40 @@ public class TaPreselectionController extends BaseController {
      */
     @RequestMapping(value = "/taPreselection/{id}", method = RequestMethod.PUT)
     public ResponseBean taPreselectionUpdate(@PathVariable Integer id,
-                                             @RequestBody TaPreselection taPreselection) {
+                                             @RequestBody TaPreselection taPreselection,
+                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+
+            if (taPreselection.getSalesBatchId() == null) {
+                responseBean.addError("销售批次为空");
+                return responseBean;
+            }
+
+            Integer orgId = getOrgId(request);
+            // 校验是否预选过
+            QueryWrapper<TaPreselection> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", orgId);
+            queryWrapper.eq("sales_batch_id", taPreselection.getSalesBatchId());
+            TaPreselection record = iTaPreselectionService.getOne(queryWrapper);
+            if (record != null) {
+                responseBean.addError("销售批次已新增过预选");
+                return responseBean;
+            }
+
+            if (StringUtils.isNotBlank(taPreselection.getPreselectionStartTime()) && StringUtils.isNotBlank(taPreselection.getPreselectionEndTime())) {
+                // 更新批次表信息
+                TaSalesBatch taSalesBatch = new TaSalesBatch();
+                taSalesBatch.setSalesBatchId(taPreselection.getSalesBatchId());
+                taSalesBatch.setPreselectionStartTime(taPreselection.getPreselectionStartTime());
+                taSalesBatch.setPreselectionEndTime(taPreselection.getPreselectionEndTime());
+                Boolean updateResult = taSalesBatchService.updateById(taSalesBatch);
+                if (!updateResult) {
+                    responseBean.addError("fail");
+                    return responseBean;
+                }
+            }
+
             if (iTaPreselectionService.updateById(taPreselection)) {
                 responseBean.addSuccess(taPreselection);
             } else {
@@ -230,11 +262,11 @@ public class TaPreselectionController extends BaseController {
      *
      * @param id 实体ID
      */
-    @RequestMapping(value = "/taPreselection/{id}", method = RequestMethod.GET)
-    public ResponseBean taPreselectionGet(@PathVariable Integer id) {
+    @RequestMapping(value = "/admin/taPreselection/{id}", method = RequestMethod.GET)
+    public ResponseBean taPreselectionGet(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaPreselectionService.getById(id));
+            responseBean = iTaPreselectionService.getPresecretById(id, getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taPreselectionDelete -=- {}", e.toString());

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -60,5 +61,33 @@ public class TaPreselection implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 出售房源数
+     */
+    @TableField(exist = false)
+    private Integer salesNumber;
 
+    /**
+     * 楼盘名
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
+    /**
+     * 销售批次名
+     */
+    @TableField(exist = false)
+    private String salesBatchName;
+
+    /**
+     * 二维码
+     */
+    @TableField(exist = false)
+    private String qrCode;
+
+    /**
+     * 预选实际热度
+     */
+    @TableField(exist = false)
+    private Integer realHeat;
 }

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

@@ -1,8 +1,14 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPreselection;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +19,31 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2020-02-26
  */
 @Mapper
+@Component
 public interface TaPreselectionMapper extends BaseMapper<TaPreselection> {
 
+    /**
+     * 条件查询预选
+     *
+     * @param page
+     * @param salesBatchName
+     * @param buildingId
+     * @param orgId
+     * @param status
+     * @param personBuildingList
+     * @return
+     */
+    IPage<TaPreselection> listPresecretByCondition(IPage<TaPreselection> page,
+                                                   @Param("salesBatchName") String salesBatchName,
+                                                   @Param("buildingId") String buildingId,
+                                                   @Param("orgId") Integer orgId,
+                                                   @Param("status") Integer status,
+                                                   @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * @param id
+     * @param orgId
+     * @return
+     */
+    TaPreselection getPresecretById(@Param("id") Integer id, @Param("orgId") Integer orgId);
 }

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

@@ -41,14 +41,6 @@ public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
      */
     Map<String, Object> getTotalHousesAndHeat(@Param("salesBatchId") Integer salesBatchId);
 
-    IPage<TaSalesBatch> listSalesBatchForPreselect(IPage<TaSalesBatch> page,
-                                                   @Param("salesBatchName") String salesBatchName,
-                                                   @Param("buildingId") String buildingId,
-                                                   @Param("orgId") Integer orgId,
-                                                   @Param("status") Integer status,
-                                                   @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-
-
     IPage<TaSalesBatch> listSalesBatchForRaise(IPage<TaSalesBatch> page,
                                                @Param("salesBatchName") String salesBatchName,
                                                @Param("buildingId") String buildingId,

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPreselection;
 
 import java.util.List;
@@ -16,6 +17,20 @@ import java.util.List;
  */
 public interface ITaPreselectionService extends IService<TaPreselection> {
 
+    /**
+     * 获取预选列表
+     *
+     * @param pageSize
+     * @param pageNum
+     * @param salesBatchName
+     * @param buildingId
+     * @param orgId
+     * @param status
+     * @return
+     */
+    ResponseBean listPresecretByCondition(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
+                                          Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
     /**
      * 批量删除
      *
@@ -25,4 +40,13 @@ public interface ITaPreselectionService extends IService<TaPreselection> {
      */
     ResponseBean batchDelete(List<TaPreselection> taPreselectionList, Integer orgId);
 
+
+    /**
+     *
+     * @param id
+     * @param orgId
+     * @return
+     */
+    ResponseBean getPresecretById(Integer id, Integer orgId);
+
 }

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

@@ -37,20 +37,6 @@ public interface ITaSalesBatchService extends IService<TaSalesBatch> {
      */
     ResponseBean getSalesBatchById(Integer salesBatchId);
 
-    /**
-     * 获取销售批次列表 - 预选
-     *
-     * @param pageSize
-     * @param pageNum
-     * @param salesBatchName
-     * @param buildingId
-     * @param orgId
-     * @param status
-     * @return
-     */
-    ResponseBean listSalesBatchForPreselect(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
-                                            Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
-
     /**
      * 获取销售批次列表 - 认筹
      *

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

@@ -2,8 +2,11 @@ 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.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPreselection;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.mapper.TaPreselectionMapper;
@@ -37,6 +40,17 @@ public class TaPreselectionServiceImpl extends ServiceImpl<TaPreselectionMapper,
     @Autowired
     private TaPreselectionRecordMapper taPreselectionRecordMapper;
 
+    @Override
+    public ResponseBean listPresecretByCondition(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId, Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        logger.info("listPresecretByCondition 接收参数：pageSize:{},pageNum:{},salesBatchName:{},buildilgId:{},orgId:{},status:{},taPersonBuildingListByUserId:{}",
+                pageSize, pageNum, salesBatchName, buildingId, orgId, status, JSONObject.toJSONString(taPersonBuildingListByUserId));
+
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaPreselection> pg = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taPreselectionMapper.listPresecretByCondition(pg, salesBatchName, buildingId, orgId, status, taPersonBuildingListByUserId));
+        return responseBean;
+    }
+
     @Override
     public ResponseBean batchDelete(List<TaPreselection> taPreselectionList, Integer orgId) {
         logger.info("TaPreselectionServiceImpl.batchDelete 接收参数：list:{},orgId:{}", JSONObject.toJSONString(taPreselectionList), orgId);
@@ -44,7 +58,6 @@ public class TaPreselectionServiceImpl extends ServiceImpl<TaPreselectionMapper,
         ResponseBean responseBean = new ResponseBean();
 
         for (TaPreselection tp : taPreselectionList) {
-
             // 校验是否有用户预选
             QueryWrapper<TaPreselectionRecord> preselectionRecordQueryWrapper = new QueryWrapper<>();
             preselectionRecordQueryWrapper.eq("org_id", orgId);
@@ -67,7 +80,13 @@ public class TaPreselectionServiceImpl extends ServiceImpl<TaPreselectionMapper,
         } else {
             responseBean.addError("fail");
         }
+        return responseBean;
+    }
 
+    @Override
+    public ResponseBean getPresecretById(Integer id, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.addSuccess(taPreselectionMapper.getPresecretById(id, orgId));
         return responseBean;
     }
 }

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

@@ -196,29 +196,6 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
         return responseBean;
     }
 
-    /**
-     * @param pageSize
-     * @param pageNum
-     * @param salesBatchName
-     * @param buildingId
-     * @param orgId
-     * @param status
-     * @return
-     */
-    @Override
-    public ResponseBean listSalesBatchForPreselect(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
-                                                   Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
-
-        logger.info("listSalesBatchForPreselect 接收参数：pageSize:{},pageNum:{},salesBatchName:{},buildilgId:{},orgId:{},status:{},taPersonBuildingListByUserId:{}",
-                pageSize, pageNum, salesBatchName, buildingId, orgId, status,JSONObject.toJSONString(taPersonBuildingListByUserId));
-
-        ResponseBean responseBean = new ResponseBean();
-
-        IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taSalesBatchMapper.listSalesBatchForPreselect(pg, salesBatchName, buildingId, orgId, status, taPersonBuildingListByUserId));
-        return responseBean;
-    }
-
     @Override
     public ResponseBean listSalesBatchForRaise(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId,
                                                Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {

src/main/resources/mapper/TaPreselectionMapper.xml

@@ -2,4 +2,58 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaPreselectionMapper">
 
+    <select id="listPresecretByCondition" resultType="com.huiju.estateagents.entity.TaPreselection">
+        SELECT
+        t.*,
+        t2.sales_number,
+        t3.building_name,
+        ( SELECT sum( th.real_heat ) FROM ta_housing_resources th WHERE th.sales_batch_id = t2.sales_batch_id AND th.`status` = 1 ) real_heat
+        FROM
+        ta_preselection t
+        LEFT JOIN ta_sales_batch t2 ON t.sales_batch_id = t2.sales_batch_id
+        LEFT JOIN ta_building t3 ON t2.building_id = t3.building_id
+        WHERE
+        t.org_id = #{orgId}
+        AND t.STATUS != - 1
+        <if test="buildingId != null and buildingId != ''">
+            and t2.building_id = #{buildingId}
+        </if>
+        <if test="salesBatchName != null and salesBatchName != ''">
+            and t2.sales_batch_name like CONCAT('%',#{salesBatchName}, '%')
+        </if>
+        <if test="status != null">
+            and t.status = #{status}
+        </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t2.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        ORDER BY
+        t.create_date DESC
+    </select>
+
+    <select id="getPresecretById" resultType="com.huiju.estateagents.entity.TaPreselection">
+        SELECT
+            t3.*,
+            t4.building_name
+        FROM
+            (
+        SELECT
+            t.*,
+            t2.qr_code,
+            t2.sales_batch_name,
+            t2.building_id
+        FROM
+            ta_preselection t,
+            ta_sales_batch t2
+        WHERE
+            t.sales_batch_id = t2.sales_batch_id
+            AND t.preselection_id = #{id}
+            AND t.org_id = #{orgId}
+            ) t3
+            LEFT JOIN ta_building t4 ON t3.building_id = t4.building_id
+    </select>
+
 </mapper>

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -51,38 +51,6 @@
             t.STATUS = 1 and t.sales_batch_id = #{salesBatchId}
     </select>
 
-    <select id="listSalesBatchForPreselect" resultType="com.huiju.estateagents.entity.TaSalesBatch">
-            SELECT
-                t.*,
-                a.building_name,
-                a.real_heat preselectCount
-            FROM
-                ta_sales_batch t
-            LEFT JOIN ta_housing_resources a ON t.building_id = a.building_id
-            WHERE
-                t.org_id = #{orgId}
-                AND t.STATUS != - 1
-                AND t.preselection_start_time IS NOT NULL
-                AND t.preselection_end_time IS NOT NULL
-            <if test="buildingId != null and buildingId != ''">
-                and t.building_id = #{buildingId}
-            </if>
-            <if test="salesBatchName != null and salesBatchName != ''">
-                and t.sales_batch_name like CONCAT('%',#{salesBatchName}, '%')
-            </if>
-            <if test="status != null">
-                and t.status = #{status}
-            </if>
-            <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND t.building_id in
-                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
-                    #{personBuilding.buildingId}
-                </foreach>
-            </if>
-            ORDER BY
-              t.create_date DESC
-    </select>
-
     <select id="listSalesBatchForRaise" resultType="com.huiju.estateagents.entity.TaSalesBatch">
         SELECT
             t.*,