新需求

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

@@ -16,6 +16,7 @@ import sun.misc.Request;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -87,6 +88,24 @@ public class TaSalesBatchController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 删除批次
+     * @param taSalesBatch 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taSalesBatch",method= RequestMethod.PUT)
+    public ResponseBean taSalesBatchDel(@RequestBody List<TaSalesBatch> salesBatchs, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaSalesBatchService.delSalesBatchList(getOrgId(request), salesBatchs);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taSalesBatchAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 根据id删除对象
      * @param id  实体ID

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

@@ -66,7 +66,7 @@ public class TaShareController extends BaseController {
                                          @RequestParam(value = "shareType", required = false)String shareType,
                                          @RequestParam(value = "personType", required = false)String personType,
                                          @RequestParam(value = "phone", required = false)String phone,
-                                         @RequestParam(value = "salesBatchId")String salesBatchId, HttpServletRequest request){
+                                         @RequestParam(value = "salesBatchId")Integer salesBatchId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (salesBatchId == null){

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

@@ -6,6 +6,8 @@ import com.huiju.estateagents.entity.TaSalesBatch;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 销售批次表  Mapper 接口
@@ -17,4 +19,14 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
     IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, @Param("salesBatchName") String salesBatchName, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId);
+
+    /**
+     * 根据批次号统计预选数据
+     * @param orgId
+     * @param taSalesBatchList
+     * @return
+     */
+    Integer countPreSelectRecord(@Param("orgId") Integer orgId, @Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
+
+    void updateSalesBatchStatus(@Param("orgId") Integer orgId, @Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
 }

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

@@ -18,5 +18,5 @@ import java.util.List;
  */
 @Mapper
 public interface TaShareMapper extends BaseMapper<TaShare> {
-    List<TaShare> selectHouseShareList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("saleBatchId")String saleBatchId);
+    List<TaShare> selectHouseShareList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("saleBatchId")Integer saleBatchId);
 }

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

@@ -3,8 +3,11 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaSalesBatch;
 
+import java.util.List;
+
 /**
  * <p>
  * 销售批次表  服务类
@@ -15,4 +18,6 @@ import com.huiju.estateagents.entity.TaSalesBatch;
  */
 public interface ITaSalesBatchService extends IService<TaSalesBatch> {
     IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId);
+
+    ResponseBean delSalesBatchList(Integer orgId, List<TaSalesBatch> taSalesBatchList);
 }

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

@@ -20,5 +20,5 @@ public interface ITaShareService extends IService<TaShare> {
 
     void makeSure(String openid, String typeOf, String id, Integer orgId);
 
-    ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, String saleBatchId);
+    ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId);
 }

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

@@ -3,12 +3,15 @@ package com.huiju.estateagents.service.impl;
 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.TaSalesBatch;
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
 import com.huiju.estateagents.service.ITaSalesBatchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 销售批次表  服务实现类
@@ -27,4 +30,16 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
     public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId) {
         return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId);
     }
+
+    @Override
+    public ResponseBean delSalesBatchList(Integer orgId, List<TaSalesBatch> taSalesBatchList) {
+        ResponseBean responseBean = new ResponseBean();
+        Integer count = taSalesBatchMapper.countPreSelectRecord(orgId, taSalesBatchList);
+        if (count > 0){
+            responseBean.addError("已有用户预选，请先删除预选记录。");
+            return responseBean;
+        }
+        taSalesBatchMapper.updateSalesBatchStatus(orgId, taSalesBatchList);
+        return responseBean;
+    }
 }

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

@@ -186,14 +186,14 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     }
 
     @Override
-    public ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, String saleBatchId) {
+    public ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId) {
         Page page = new Page(pageNum,pageSize);
         // 分页查询
         List<TaShare> list = taShareMapper.selectHouseShareList(page, orgId, personType, shareType, phone, saleBatchId);
         TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
-//        list.forEach(e -> {
-//            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
-//        });
+        list.forEach(e -> {
+            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+        });
         page.setRecords(list);
         return ResponseBean.success(page);
     }

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -63,6 +63,8 @@
         a.term_name,
         t.`status`,
         t.update_date,
+        t.building_id,
+        t.sales_batch_id,
         (select name from ta_person t where (t.user_id = t.update_user || t.person_id = t.update_user)) as updateName
         from ta_preselection_record t
         left join ta_housing_resources a on t.house_id = a.house_id

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaSalesBatchMapper">
+    <update id="updateSalesBatchStatus">
+      update ta_sales_batch t set t.status = -1
+      where t.org_id = #{orgId}
+      and t.sales_batch_id in
+      <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
+         #{taSalesBatch.salesBatchId}
+      </foreach>
+    </update>
 
     <select id="selectByCondition" resultType="com.huiju.estateagents.entity.TaSalesBatch">
         select t.*, a.building_name from ta_sales_batch t
         left join ta_building a on t.building_id = a.building_id
-        where t.org_id = #{orgId}
+        where t.org_id = #{orgId} and t.status != -1
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
@@ -16,4 +24,13 @@
             and t.status = #{status}
         </if>
     </select>
+
+    <select id="countPreSelectRecord" resultType="java.lang.Integer">
+      select count(*) from ta_preselection_record t
+      where t.org_id = #{orgId}
+      and t.sales_batch_id in
+      <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
+          #{taSalesBatch.salesBatchId}
+      </foreach>
+    </select>
 </mapper>

src/main/resources/mapper/TaShareMapper.xml

@@ -5,7 +5,10 @@
     <select id="selectHouseShareList" resultType="com.huiju.estateagents.entity.TaShare">
       select a.avatarurl as photoOravatar, a.nickname as nameOrnick, a.name, a.phone, a.person_type, t.create_date From ta_share t
       left join ta_person a on t.person_id = a.person_id
+      left join ta_housing_resources b on t.be_share = b.house_id
       where a.org_id = #{orgId}
+      and t.tagert_type in ('housePost','houseApp')
+      and b.sales_batch_id = #{saleBatchId}
       <if test="personType != null and personType != ''">
           and a.person_Type = #{personType}
       </if>