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

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

@@ -1,21 +1,28 @@
 package com.huiju.estateagents.controller;
 
+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.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
-    * 预选表  前端控制器
-    * </p>
+ * 预选表  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2020-02-26
@@ -29,28 +36,62 @@ public class TaPreselectionController extends BaseController {
     @Autowired
     public ITaPreselectionService iTaPreselectionService;
 
+    @Autowired
+    private TaSalesBatchServiceImpl taSalesBatchService;
+
+    /**
+     * 获取销售批次列表-预选
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param salesBatchName
+     * @param status
+     * @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) {
+        ResponseBean responseBean = new ResponseBean();
+
+        try {
+            Integer orgId = getOrgId(request);
+            List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
+
+            responseBean = taSalesBatchService.listSalesBatchForPreselect(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
+            logger.info("listSalesBatchForPreselect 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("listSalesBatchForPreselect -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taPreselection",method= RequestMethod.GET)
-    public ResponseBean taPreselectionList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/taPreselection", method = RequestMethod.GET)
+    public ResponseBean taPreselectionList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaPreselection> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPreselection> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaPreselection> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaPreselection> result = iTaPreselectionService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPreselectionList -=- {}",e.toString());
+            logger.error("taPreselectionList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,43 +99,97 @@ public class TaPreselectionController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taPreselection 实体对象
      * @return
      */
-    @RequestMapping(value="/taPreselection",method= RequestMethod.POST)
-    public ResponseBean taPreselectionAdd(@RequestBody TaPreselection taPreselection){
+    @RequestMapping(value = "/admin/taPreselection", method = RequestMethod.POST)
+    public ResponseBean taPreselectionAdd(@RequestBody TaPreselection taPreselection, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaPreselectionService.save(taPreselection)){
+            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;
+            }
+
+            // 更新批次表信息
+            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.save(taPreselection)) {
                 responseBean.addSuccess(taPreselection);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taPreselectionAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param taPreselectionList
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/admin/preselection/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDelete(@RequestBody List<TaPreselection> taPreselectionList, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer orgId = getOrgId(request);
+            responseBean = iTaPreselectionService.batchDelete(taPreselectionList, orgId);
+            logger.info("TaPreselectionController.batchDelete 返回：{}", JSONObject.toJSONString(responseBean));
+
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPreselectionAdd -=- {}",e.toString());
+            logger.error("taPreselectionDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
 
     /**
-     * 根据id删除对象
-     * @param id  实体ID
+     * 删除
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taPreselection/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taPreselectionDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/admin/taPreselection/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taPreselectionDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaPreselectionService.removeById(id)){
+            if (iTaPreselectionService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPreselectionDelete -=- {}",e.toString());
+            logger.error("taPreselectionDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,23 +197,24 @@ public class TaPreselectionController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id             实体ID
      * @param taPreselection 实体对象
      * @return
      */
-    @RequestMapping(value="/taPreselection/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taPreselection/{id}", method = RequestMethod.PUT)
     public ResponseBean taPreselectionUpdate(@PathVariable Integer id,
-                                        @RequestBody TaPreselection taPreselection){
+                                             @RequestBody TaPreselection taPreselection) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaPreselectionService.updateById(taPreselection)){
+            if (iTaPreselectionService.updateById(taPreselection)) {
                 responseBean.addSuccess(taPreselection);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPreselectionUpdate -=- {}",e.toString());
+            logger.error("taPreselectionUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -126,16 +222,17 @@ public class TaPreselectionController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taPreselection/{id}",method= RequestMethod.GET)
-    public ResponseBean taPreselectionGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taPreselection/{id}", method = RequestMethod.GET)
+    public ResponseBean taPreselectionGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaPreselectionService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPreselectionDelete -=- {}",e.toString());
+            logger.error("taPreselectionDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -1,22 +1,28 @@
 package com.huiju.estateagents.controller;
 
+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.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
 import com.huiju.estateagents.service.ITaRaiseService;
+import com.huiju.estateagents.service.ITaSalesBatchService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
-    * 认筹表  前端控制器
-    * </p>
+ * 认筹表  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2020-02-26
@@ -30,28 +36,63 @@ public class TaRaiseController extends BaseController {
     @Autowired
     public ITaRaiseService iTaRaiseService;
 
+    @Autowired
+    private ITaSalesBatchService iTaSalesBatchService;
+
+    /**
+     * 获取销售批次列表-认筹
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param salesBatchName
+     * @param status
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "admin/listSalesBatchForRaise", method = RequestMethod.GET)
+    public ResponseBean listSalesBatchForRaise(@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 = iTaSalesBatchService.listSalesBatchForRaise(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
+            logger.info("listSalesBatchForRaise 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("listSalesBatchForRaise -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taRaise",method= RequestMethod.GET)
-    public ResponseBean taRaiseList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/admin/taRaise", method = RequestMethod.GET)
+    public ResponseBean taRaiseList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaRaise> pg = new Page<>(pageNum, pageSize);
+            IPage<TaRaise> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaRaise> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaRaise> result = iTaRaiseService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseList -=- {}",e.toString());
+            logger.error("taRaiseList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -59,28 +100,52 @@ public class TaRaiseController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taRaise 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taRaise",method= RequestMethod.POST)
-    public ResponseBean taRaiseAdd(@RequestBody TaRaise taRaise){
+    @RequestMapping(value = "/admin/taRaise", method = RequestMethod.POST)
+    public ResponseBean taRaiseAdd(@RequestBody TaRaise taRaise) {
         ResponseBean responseBean = new ResponseBean();
         try {
             // 参数校验
             Integer raisePrice = taRaise.getRaisePrice();
-            if(raisePrice != null && raisePrice > CommConstant.MAX_RAISE_PRICE){
+            if (raisePrice != null && raisePrice > CommConstant.MAX_RAISE_PRICE) {
                 responseBean.addError("认筹金额最高50000");
                 return responseBean;
             }
 
-            if (iTaRaiseService.save(taRaise)){
+            if (iTaRaiseService.save(taRaise)) {
                 responseBean.addSuccess(taRaise);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRaiseAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param taRaiseList
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/admin/raise/batchDelete", method = RequestMethod.DELETE)
+    public ResponseBean batchDelete(@RequestBody List<TaRaise> taRaiseList, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer orgId = getOrgId(request);
+            responseBean = iTaRaiseService.batchDelete(taRaiseList, orgId);
+
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseAdd -=- {}",e.toString());
+            logger.error("taRaiseDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -88,21 +153,22 @@ public class TaRaiseController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taRaise/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taRaiseDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taRaise/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRaiseDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaRaiseService.removeById(id)){
+            if (iTaRaiseService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseDelete -=- {}",e.toString());
+            logger.error("taRaiseDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -110,23 +176,24 @@ public class TaRaiseController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id      实体ID
      * @param taRaise 实体对象
      * @return
      */
-    @RequestMapping(value="/taRaise/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taRaise/{id}", method = RequestMethod.PUT)
     public ResponseBean taRaiseUpdate(@PathVariable Integer id,
-                                        @RequestBody TaRaise taRaise){
+                                      @RequestBody TaRaise taRaise) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaRaiseService.updateById(taRaise)){
+            if (iTaRaiseService.updateById(taRaise)) {
                 responseBean.addSuccess(taRaise);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseUpdate -=- {}",e.toString());
+            logger.error("taRaiseUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -134,16 +201,17 @@ public class TaRaiseController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taRaise/{id}",method= RequestMethod.GET)
-    public ResponseBean taRaiseGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taRaise/{id}", method = RequestMethod.GET)
+    public ResponseBean taRaiseGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaRaiseService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseDelete -=- {}",e.toString());
+            logger.error("taRaiseDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.controller;
 
-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;
@@ -9,11 +8,11 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.*;
+import com.huiju.estateagents.service.impl.TaPreselectionServiceImpl;
 import com.huiju.estateagents.service.impl.TaRaiseServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -53,6 +52,9 @@ public class TaSalesBatchController extends BaseController {
     @Autowired
     public TaRaiseServiceImpl taRaiseService;
 
+    @Autowired
+    private TaPreselectionServiceImpl taPreselectionService;
+
     /**
      * 分页查询列表
      *
@@ -137,6 +139,34 @@ public class TaSalesBatchController extends BaseController {
     public ResponseBean taSalesBatchDel(@RequestBody List<TaSalesBatch> salesBatchs, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+
+            Integer orgId = getOrgId(request);
+
+            for (TaSalesBatch ts : salesBatchs) {
+
+                // 校验批次下是否有预选记录
+                QueryWrapper<TaPreselection> preselectionQueryWrapper = new QueryWrapper<>();
+                preselectionQueryWrapper.eq("org_id", orgId);
+                preselectionQueryWrapper.eq("sales_batch_id", ts.getSalesBatchId());
+                preselectionQueryWrapper.eq("status", 1);
+                TaPreselection preselection = taPreselectionService.getOne(preselectionQueryWrapper);
+                if (preselection != null) {
+                    responseBean.addError(String.format("销售批次%s关联有预选,请先删除关联的预选模块", ts.getSalesBatchId()));
+                    return responseBean;
+                }
+
+                // 校验批次下是否有认筹
+                QueryWrapper<TaRaise> raiseQueryWrapper = new QueryWrapper<>();
+                raiseQueryWrapper.eq("org_id", orgId);
+                raiseQueryWrapper.eq("sales_batch_id", ts.getSalesBatchId());
+                raiseQueryWrapper.eq("status", 1);
+                TaRaise raise = taRaiseService.getOne(raiseQueryWrapper);
+                if (raise != null) {
+                    responseBean.addError(String.format("销售批次%s关联有认筹,请先删除关联的预选模块", ts.getSalesBatchId()));
+                    return responseBean;
+                }
+            }
+
             List<Integer> liveActivityIds = new ArrayList<>();
             for (TaSalesBatch taSalesBatch : salesBatchs) {
                 liveActivityIds.add(taSalesBatch.getSalesBatchId());
@@ -278,117 +308,4 @@ public class TaSalesBatchController extends BaseController {
         }
         return responseBean;
     }
-
-    /**
-     * 获取销售批次列表-预选
-     *
-     * @param pageNum
-     * @param pageSize
-     * @param buildingId
-     * @param salesBatchName
-     * @param status
-     * @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) {
-        ResponseBean responseBean = new ResponseBean();
-
-        try {
-            Integer orgId = getOrgId(request);
-            List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
-
-            responseBean = iTaSalesBatchService.listSalesBatchForPreselect(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
-            logger.info("listSalesBatchForPreselect 返回结果：{}", JSONObject.toJSONString(responseBean));
-        } catch (Exception e) {
-            logger.error("listSalesBatchForPreselect -=- {}", e);
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 获取销售批次列表-认筹
-     *
-     * @param pageNum
-     * @param pageSize
-     * @param buildingId
-     * @param salesBatchName
-     * @param status
-     * @param request
-     * @return
-     */
-    @RequestMapping(value = "admin/listSalesBatchForRaise", method = RequestMethod.GET)
-    public ResponseBean listSalesBatchForRaise(@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 = iTaSalesBatchService.listSalesBatchForRaise(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
-            logger.info("listSalesBatchForRaise 返回结果：{}", JSONObject.toJSONString(responseBean));
-        } catch (Exception e) {
-            logger.error("listSalesBatchForRaise -=- {}", e);
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 添加预选记录
-     *
-     * @param salesBatchId       销售批次
-     * @param preselectStartTime 预选开始时间
-     * @param preselectEndTime   预选结束时间
-     * @param request
-     * @return
-     */
-    @RequestMapping(value = "/admin/savePreselectRecord", method = RequestMethod.POST)
-    public ResponseBean savePreselectRecord(@RequestParam(value = "salesBatchId", required = true) Integer salesBatchId,
-                                            @RequestParam(value = "preselectStartTime", required = true) String preselectStartTime,
-                                            @RequestParam(value = "preselectEndTime", required = true) String preselectEndTime,
-                                            HttpServletRequest request) {
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            Integer orgId = getOrgId(request);
-
-            // 校验是否新增过预选
-            QueryWrapper<TaSalesBatch> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("sales_batch_id", salesBatchId);
-            queryWrapper.eq("org_id", orgId);
-            TaSalesBatch taSalesBatch = iTaSalesBatchService.getOne(queryWrapper);
-            if (taSalesBatch == null) {
-                responseBean.addError("批次不存在");
-                return responseBean;
-            }
-
-            if (taSalesBatch.getPreselectionStartTime() != null || taSalesBatch.getPreselectionEndTime() != null) {
-                responseBean.addError("销售批次已新增过预选");
-                return responseBean;
-            }
-
-            // 更新
-            TaSalesBatch record = new TaSalesBatch();
-            record.setSalesBatchId(salesBatchId);
-            record.setPreselectionStartTime(preselectStartTime);
-            record.setPreselectionEndTime(preselectEndTime);
-            if (iTaSalesBatchService.updateById(record)) {
-                responseBean.addSuccess("success");
-            } else {
-                responseBean.addError("fail");
-            }
-
-        } catch (Exception e) {
-            logger.error("savePreselectRecord -=- {}", e);
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
 }

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

@@ -43,12 +43,12 @@ public class TaPreselection implements Serializable {
     /**
      * 预选开始时间
      */
-    private LocalDateTime preselectionStartTime;
+    private String preselectionStartTime;
 
     /**
      * 预选结束时间
      */
-    private LocalDateTime preselectionEndTime;
+    private String preselectionEndTime;
 
     /**
      * 状态

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

@@ -1,8 +1,11 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPreselection;
 
+import java.util.List;
+
 /**
  * <p>
  * 预选表  服务类
@@ -13,4 +16,13 @@ import com.huiju.estateagents.entity.TaPreselection;
  */
 public interface ITaPreselectionService extends IService<TaPreselection> {
 
+    /**
+     * 批量删除
+     *
+     * @param taPreselectionList
+     * @param orgId
+     * @return
+     */
+    ResponseBean batchDelete(List<TaPreselection> taPreselectionList, Integer orgId);
+
 }

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

@@ -1,8 +1,12 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaRaise;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
  * 认筹表  服务类
@@ -13,4 +17,12 @@ import com.huiju.estateagents.entity.TaRaise;
  */
 public interface ITaRaiseService extends IService<TaRaise> {
 
+    /**
+     * 批量删除
+     *
+     * @param taRaiseList
+     * @param orgId
+     * @return
+     */
+    ResponseBean batchDelete(List<TaRaise> taRaiseList, Integer orgId);
 }

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

@@ -1,11 +1,23 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPreselection;
+import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.mapper.TaPreselectionMapper;
+import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
 import com.huiju.estateagents.service.ITaPreselectionService;
+import org.apache.commons.collections.CollectionUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 预选表  服务实现类
@@ -17,4 +29,45 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPreselectionServiceImpl extends ServiceImpl<TaPreselectionMapper, TaPreselection> implements ITaPreselectionService {
 
+    private Logger logger = LoggerFactory.getLogger(TaPreselectionServiceImpl.class);
+
+    @Autowired
+    private TaPreselectionMapper taPreselectionMapper;
+
+    @Autowired
+    private TaPreselectionRecordMapper taPreselectionRecordMapper;
+
+    @Override
+    public ResponseBean batchDelete(List<TaPreselection> taPreselectionList, Integer orgId) {
+        logger.info("TaPreselectionServiceImpl.batchDelete 接收参数：list:{},orgId:{}", JSONObject.toJSONString(taPreselectionList), orgId);
+
+        ResponseBean responseBean = new ResponseBean();
+
+        for (TaPreselection tp : taPreselectionList) {
+
+            // 校验是否有用户预选
+            QueryWrapper<TaPreselectionRecord> preselectionRecordQueryWrapper = new QueryWrapper<>();
+            preselectionRecordQueryWrapper.eq("org_id", orgId);
+            preselectionRecordQueryWrapper.eq("sales_batch_id", tp.getSalesBatchId());
+            preselectionRecordQueryWrapper.eq("status", 1);
+            List<TaPreselectionRecord> tpList = taPreselectionRecordMapper.selectList(preselectionRecordQueryWrapper);
+            if (CollectionUtils.isNotEmpty(tpList)) {
+                responseBean.addError(String.format("销售批次%s已有用户预选，请先删除预选记录。", tp.getSalesBatchId()));
+                return responseBean;
+            }
+        }
+
+        taPreselectionList.stream().forEach(record -> {
+            record.setStatus(-1);
+        });
+
+        // 更新数据库
+        if (updateBatchById(taPreselectionList)) {
+            responseBean.addSuccess("success");
+        } else {
+            responseBean.addError("fail");
+        }
+
+        return responseBean;
+    }
 }

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

@@ -1,11 +1,23 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaRaise;
+import com.huiju.estateagents.entity.TaRaiseRecord;
 import com.huiju.estateagents.mapper.TaRaiseMapper;
+import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
 import com.huiju.estateagents.service.ITaRaiseService;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
  * 认筹表  服务实现类
@@ -17,4 +29,46 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> implements ITaRaiseService {
 
+    private Logger logger = LoggerFactory.getLogger(TaRaiseServiceImpl.class);
+
+    @Autowired
+    private TaRaiseRecordMapper taRaiseRecordMapper;
+
+    @Override
+    public ResponseBean batchDelete(List<TaRaise> taRaiseList, Integer orgId) {
+        logger.info("TaRaiseServiceImpl.batchDelete 接收参数：list:{},orgId:{}", JSONObject.toJSONString(taRaiseList), orgId);
+
+        ResponseBean responseBean = new ResponseBean();
+        // 校验参数
+        if (CollectionUtils.isEmpty(taRaiseList)) {
+            responseBean.addError("参数错误");
+            return responseBean;
+        }
+
+        for (TaRaise tr : taRaiseList) {
+
+            // 校验销售批次下是否有认筹记录
+            QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
+            taRaiseRecordQueryWrapper.eq("org_id", orgId);
+//            taRaiseRecordQueryWrapper.eq("raise_id", tr.getRaiseId());
+            taRaiseRecordQueryWrapper.eq("sales_batch_id", tr.getSalesBatchId());
+            taRaiseRecordQueryWrapper.eq("status", 1);
+            List<TaRaiseRecord> list = taRaiseRecordMapper.selectList(taRaiseRecordQueryWrapper);
+            if (CollectionUtils.isNotEmpty(list)) {
+                responseBean.addError(String.format("销售批次%s下已有认筹记录，不可删除", tr.getSalesBatchId()));
+                return responseBean;
+            }
+        }
+
+        taRaiseList.stream().forEach(record -> {
+            record.setStatus(-1);
+        });
+
+        if (updateBatchById(taRaiseList)) {
+            responseBean.addError("success");
+        } else {
+            responseBean.addError("fail");
+        }
+        return responseBean;
+    }
 }

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -79,10 +79,10 @@
                     #{personBuilding.buildingId}
                 </foreach>
             </if>
-
+            ORDER BY
+              t.create_date DESC
     </select>
 
-
     <select id="listSalesBatchForRaise" resultType="com.huiju.estateagents.entity.TaSalesBatch">
         SELECT
             t.*,
@@ -118,5 +118,7 @@
                 #{personBuilding.buildingId}
             </foreach>
         </if>
+        ORDER BY
+            t.create_date DESC
     </select>
 </mapper>