* 代码优化

src/main/java/com/huiju/estateagents/bo/request/HousingRaiseRequestBO.java

@@ -0,0 +1,65 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 查询房源认筹记录请求实体
+ *
+ * @Auther: gusy
+ * @Date: 2020/2/28 01:01
+ */
+@Data
+public class HousingRaiseRequestBO {
+
+    private Integer orgId;
+
+    /**
+     * 销售批次ID
+     */
+    private Integer salesBatchId;
+
+    /**
+     * 房源ID
+     */
+    private Integer houseId;
+
+    /**
+     * 期名
+     */
+    private String termName;
+
+    /**
+     * 楼栋名
+     */
+    private String blockName;
+
+    /**
+     * 单元名
+     */
+    private String unitName;
+
+    /**
+     * 楼层名
+     */
+    private String floorName;
+
+    /**
+     * 房间名
+     */
+    private String roomName;
+
+    /**
+     * 户型Id
+     */
+    private String apartmentId;
+
+    /**
+     * 房源发布状态
+     */
+    private Integer status;
+
+    /**
+     * 房源锁定状态
+     */
+    private Integer lockingStatus;
+}

src/main/java/com/huiju/estateagents/bo/request/PresecretRecordRequestBO.java

@@ -0,0 +1,72 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 预选记录查询请求实体
+ *
+ * @Auther: gusy
+ * @Date: 2020/2/28 00:14
+ */
+@Data
+public class PresecretRecordRequestBO {
+
+    private Integer orgId;
+
+    private String salesBatchId;
+
+    /**
+     * 期名
+     */
+    private String termName;
+
+    /**
+     * 楼栋名
+     */
+    private String blockName;
+
+    /**
+     * 单元名
+     */
+    private String unitName;
+
+    /**
+     * 楼层名
+     */
+    private String floorName;
+
+    /**
+     * 房间名
+     */
+    private String roomName;
+
+    /**
+     * 房号
+     */
+    private Integer house;
+
+    /**
+     * 用户手机号
+     */
+    private String phone;
+
+    /**
+     * 户型Id
+     */
+    private String apartmentId;
+
+    /**
+     * 预选状态
+     */
+    private Integer status;
+
+    /**
+     * 修改开始时间
+     */
+    private String startTime;
+
+    /**
+     * 修改结束时间
+     */
+    private String endTime;
+}

src/main/java/com/huiju/estateagents/bo/request/RaiseOrderRequestBO.java

@@ -41,7 +41,7 @@ public class RaiseOrderRequestBO {
     /**
      * 微信流水号
      */
-    private String transactionId ;
+    private String transactionId;
 
     /**
      * 微信退款号
@@ -52,4 +52,14 @@ public class RaiseOrderRequestBO {
      * 支付状态
      */
     private String payStatus;
+
+    /**
+     * 开始时间
+     */
+    private String payStartTime;
+
+    /**
+     * 结束时间
+     */
+    private String payEndTime;
 }

src/main/java/com/huiju/estateagents/bo/request/RaiseRecordRequestBO.java

@@ -82,4 +82,14 @@ public class RaiseRecordRequestBO {
      * 缴费方式
      */
     private String payType;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
 }

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

@@ -6,6 +6,7 @@ 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.bo.request.PresecretRecordRequestBO;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
 import org.apache.commons.lang3.StringUtils;
@@ -208,17 +209,13 @@ public class TaPreselectionRecordController extends BaseController {
     }
 
     @RequestMapping(value = "/admin/taPreselectRecord", method = RequestMethod.GET)
-    public ResponseBean selectPreSelectRecordList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+    public ResponseBean selectPreSelectRecordList(PresecretRecordRequestBO recordRequestBO,
+                                                  @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                  @RequestParam(value = "salesBatchId") String salesBatchId,
-                                                  @RequestParam(value = "house", required = false) Integer house,
-                                                  @RequestParam(value = "phone", required = false) String phone,
-                                                  @RequestParam(value = "apartmentId", required = false) String apartmentId,
-                                                  @RequestParam(value = "status", required = false) Integer status,
                                                   HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaPreselectionRecordService.selectPreSelectRecordList(pageNum, pageSize, salesBatchId, house, getOrgId(request), phone, apartmentId, status);
+            responseBean = iTaPreselectionRecordService.selectPreSelectRecordList(recordRequestBO, pageNum, pageSize);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesList -=- {}", e.toString());

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

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.common.CommConstant;
@@ -13,7 +15,6 @@ import org.apache.commons.lang3.StringUtils;
 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;
@@ -37,13 +38,38 @@ public class TaRaiseRecordController extends BaseController {
     @Autowired
     public ITaRaiseRecordService iTaRaiseRecordService;
 
+    /**
+     * 条件查询房源认筹记录
+     *
+     * @param requestBO
+     * @param pageNumber
+     * @param pageSize
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "listHousingRaiseByCondition", method = RequestMethod.GET)
+    public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO,
+                                                    @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.listHousingRaiseByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            requestBO.setOrgId(getOrgId(request));
+            responseBean = iTaRaiseRecordService.listHousingRaiseByCondition(requestBO, pageNumber, pageSize);
+            logger.info("TaRaiseRecordController.listHousingRaiseByCondition 返回：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.listHousingRaiseByCondition -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 
     /**
      * 条件查询认筹单
      *
      * @param recordRequestBO
-     * @param startTime
-     * @param endTime
      * @param pageNumber
      * @param pageSize
      * @param request
@@ -51,13 +77,10 @@ public class TaRaiseRecordController extends BaseController {
      */
     @RequestMapping(value = "/admin/listRaiseRecordByCondition", method = RequestMethod.GET)
     public ResponseBean listRaiseRecordByCondition(RaiseRecordRequestBO recordRequestBO,
-                                                   @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
-                                                   @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
                                                    @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest request) {
-        logger.info("TaRaiseRecordController.listRaiseRecordByCondition 接收参数：bo:{},startTime:{},endTime:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(recordRequestBO),
-                startTime, endTime, pageNumber, pageSize);
+        logger.info("TaRaiseRecordController.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(recordRequestBO), pageNumber, pageSize);
 
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -68,7 +91,7 @@ public class TaRaiseRecordController extends BaseController {
             }
 
             recordRequestBO.setOrgId(getOrgId(request));
-            responseBean = iTaRaiseRecordService.listRaiseRecordByCondition(recordRequestBO, startTime, endTime, pageNumber, pageSize);
+            responseBean = iTaRaiseRecordService.listRaiseRecordByCondition(recordRequestBO, pageNumber, pageSize);
             logger.info("TaRaiseRecordController.listRaiseRecordByCondition 返回：{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("TaRaiseRecordController.taRaiseRecordList -=- {}", e);
@@ -81,8 +104,6 @@ public class TaRaiseRecordController extends BaseController {
      * 条件查询缴费单
      *
      * @param orderRequestBO
-     * @param payStartTime
-     * @param payEndTime
      * @param pageNumber
      * @param pageSize
      * @param request
@@ -90,25 +111,21 @@ public class TaRaiseRecordController extends BaseController {
      */
     @RequestMapping(value = "/admin/listRaiseOrderByCondition", method = RequestMethod.GET)
     public ResponseBean listRaiseOrderByCondition(RaiseOrderRequestBO orderRequestBO,
-                                             @RequestParam(value = "payStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payStartTime,
-                                             @RequestParam(value = "payEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payEndTime,
-                                             @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
-                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                             HttpServletRequest request) {
-        logger.info("TaRaiseRecordController.listOrderByCondition 接收参数：bo:{},startTime:{},endTime:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(orderRequestBO),
-                payStartTime, payEndTime, pageNumber, pageSize);
+                                                  @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                  HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.listOrderByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(orderRequestBO), pageNumber, pageSize);
 
         ResponseBean responseBean = new ResponseBean();
         try {
             orderRequestBO.setOrgId(getOrgId(request));
-            responseBean = iTaRaiseRecordService.listRaiseOrderByCondition(orderRequestBO, payStartTime, payEndTime, pageNumber, pageSize);
+            responseBean = iTaRaiseRecordService.listRaiseOrderByCondition(orderRequestBO, pageNumber, pageSize);
             logger.info("TaRaiseRecordController.listOrderByCondition 返回：{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("TaRaiseRecordController.listOrderByCondition -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
-
     }
 
     /**
@@ -131,7 +148,11 @@ public class TaRaiseRecordController extends BaseController {
                 return responseBean;
             }
 
-            raiseRecordList.stream().forEach(record -> record.setInvalidReason(invalidReason));
+            raiseRecordList.stream().forEach(record -> {
+                record.setInvalidReason(invalidReason);
+                record.setUpdateDate(LocalDateTime.now());
+                record.setStatus(0);
+            });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
                 responseBean.addSuccess("success");
@@ -157,13 +178,16 @@ public class TaRaiseRecordController extends BaseController {
 
         ResponseBean responseBean = new ResponseBean();
         try {
-            // 参数错误
+            // 参数校验
             if (CollectionUtils.isEmpty(raiseRecordList)) {
                 responseBean.addError("参数错误");
                 return responseBean;
             }
 
-            raiseRecordList.stream().forEach(record -> record.setStatus(CommConstant.STATUS_DELETE));
+            raiseRecordList.stream().forEach(record -> {
+                record.setStatus(CommConstant.STATUS_DELETE);
+                record.setUpdateDate(LocalDateTime.now());
+            });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
                 responseBean.addSuccess("success");
@@ -177,6 +201,128 @@ public class TaRaiseRecordController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 批量线下缴费
+     *
+     * @param raiseRecordList
+     * @return
+     */
+    @RequestMapping(value = "/admin/batchPayOfflineRaiseRecord", method = RequestMethod.PUT)
+    public ResponseBean batchPayOfflineRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList, HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.batchPayOfflineRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecordList));
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 参数校验
+            if (CollectionUtils.isEmpty(raiseRecordList)) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            Integer orgId = getOrgId(request);
+            TaRaiseRecord tr;
+            QueryWrapper<TaRaiseRecord> queryWrapper;
+            for (TaRaiseRecord record : raiseRecordList) {
+                queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id", orgId);
+                queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
+                tr = iTaRaiseRecordService.getOne(queryWrapper);
+                if (tr == null) {
+                    responseBean.addError(String.format("未找到认筹单编号为%s的记录", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+                if (-1 == tr.getStatus()) {
+                    responseBean.addError(String.format("认筹单编号为%s的记录已作废，请重新选择", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+                if (!CommConstant.PAY_STATUS_UNPAID.equals(tr.getPayStatus())) {
+                    responseBean.addError(String.format("认筹单编号为%s的记录已缴费或意图款，请重新选择", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+            }
+
+            // 设置缴费状态为已缴费
+            raiseRecordList.stream().forEach(record -> {
+                record.setPayStatus(CommConstant.PAY_STATUS_PAID);
+                record.setUpdateDate(LocalDateTime.now());
+            });
+
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.batchPayOfflineRaiseRecord -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量线下退费
+     *
+     * @param raiseRecordList
+     * @param refundReason    退款原因
+     * @return
+     */
+    @RequestMapping(value = "/admin/batchRefundOfflineRaiseRecord", method = RequestMethod.PUT)
+    public ResponseBean batchRefundOfflineRaiseRecord(@RequestBody List<TaRaiseRecord> raiseRecordList, String refundReason,
+                                                      HttpServletRequest request) {
+        logger.info("TaRaiseRecordController.batchRefundOfflineRaiseRecord 接收参数：{},refundReason:{}", JSONObject.toJSONString(raiseRecordList), refundReason);
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 参数校验
+            if (CollectionUtils.isEmpty(raiseRecordList) || StringUtils.isBlank(refundReason)) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            Integer orgId = getOrgId(request);
+            TaRaiseRecord tr;
+            QueryWrapper<TaRaiseRecord> queryWrapper;
+            for (TaRaiseRecord record : raiseRecordList) {
+                queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id", orgId);
+                queryWrapper.eq("raise_record_id", record.getRaiseRecordId());
+                tr = iTaRaiseRecordService.getOne(queryWrapper);
+                if (tr == null) {
+                    responseBean.addError(String.format("未找到认筹单编号为%s的记录", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+                if (-1 == tr.getStatus()) {
+                    responseBean.addError(String.format("认筹单编号为%s的记录已作废，请重新选择", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+                if (CommConstant.PAY_STATUS_UNPAID.equals(tr.getPayStatus())) {
+                    responseBean.addError(String.format("认筹单编号为%s的未缴费，请重新选择", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+                if (CommConstant.PAY_STATUS_REFUNDED.equals(tr.getPayStatus())) {
+                    responseBean.addError(String.format("认筹单编号为%s的记录已退费，请重新选择", record.getRaiseRecordId()));
+                    return responseBean;
+                }
+            }
+
+            raiseRecordList.stream().forEach(record -> {
+                record.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
+                record.setRefundReason(refundReason);
+                record.setUpdateDate(LocalDateTime.now());
+            });
+
+            if (iTaRaiseRecordService.updateBatchById(raiseRecordList)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            logger.error("TaRaiseRecordController.batchRefundOfflineRaiseRecord -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 保存对象
      *

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

@@ -13,6 +13,7 @@ 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;
@@ -197,7 +198,6 @@ public class TaSalesBatchController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             taSalesBatch.setSalesBatchId(id);
-
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id", getOrgId(request));
             queryWrapper.eq("content_type", CommConstant.SALES_BATCH);
@@ -330,7 +330,6 @@ public class TaSalesBatchController extends BaseController {
 
         try {
             Integer orgId = getOrgId(request);
-            orgId = 84;
             List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
 
             responseBean = iTaSalesBatchService.listSalesBatchForRaise(pageSize, pageNum, salesBatchName, buildingId, orgId, status, personBuildingList);
@@ -341,4 +340,55 @@ public class TaSalesBatchController extends BaseController {
         }
         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/mapper/TaPreselectionRecordMapper.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.bo.request.PresecretRecordRequestBO;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 import org.apache.ibatis.annotations.Mapper;
@@ -46,20 +47,10 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
 
     /**
      * 查询预选记录表
+     *
      * @param page
-     * @param salesBatchId
-     * @param houseId
-     * @param orgId
-     * @param phone
-     * @param apartmentId
-     * @param status
+     * @param bo
      * @return
      */
-    List<TaPreselectionRecord> selectPreSelectRecordList(Page page,
-                                                         @Param("salesBatchId") String salesBatchId,
-                                                         @Param("houseId") Integer houseId,
-                                                         @Param("orgId") Integer orgId,
-                                                         @Param("phone") String phone,
-                                                         @Param("apartmentId") String apartmentId,
-                                                         @Param("status") Integer status);
+    List<TaPreselectionRecord> selectPreSelectRecordList(Page page, @Param("bo") PresecretRecordRequestBO bo);
 }

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

@@ -2,14 +2,15 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.entity.TaRaiseRecord;
+import com.huiju.estateagents.po.TaHousingResourcesPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -29,28 +30,30 @@ public interface TaRaiseRecordMapper extends BaseMapper<TaRaiseRecord> {
      *
      * @param page
      * @param bo
-     * @param startTime
-     * @param endTime
+     * @return
+     */
+    IPage<TaHousingResourcesPO> listHousingRaiseByCondition(IPage<TaHousingResourcesPO> page,
+                                                            @Param("bo") HousingRaiseRequestBO bo);
+
+    /**
+     * 条件查询认筹单
+     *
+     * @param page
+     * @param bo
      * @return
      */
     IPage<TaRaiseRecord> listRaiseRecordByCondition(IPage<TaRaiseRecord> page,
-                                                    @Param("bo") RaiseRecordRequestBO bo,
-                                                    @Param("startTime") LocalDateTime startTime,
-                                                    @Param("endTime") LocalDateTime endTime);
+                                                    @Param("bo") RaiseRecordRequestBO bo);
 
     /**
      * 条件查询缴费单
      *
      * @param page
      * @param bo
-     * @param startTime
-     * @param endTime
      * @return
      */
     IPage<TaRaiseRecord> listRaiseOrderByCondition(IPage<TaRaiseRecord> page,
-                                              @Param("bo") RaiseOrderRequestBO bo,
-                                              @Param("startTime") LocalDateTime startTime,
-                                              @Param("endTime") LocalDateTime endTime);
+                                              @Param("bo") RaiseOrderRequestBO bo);
 
     /**
      * 批量更新

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.PresecretRecordRequestBO;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 
@@ -44,6 +45,6 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      */
     ResponseBean taPreselectionRecordCancel(String personId, String houseId);
 
-    ResponseBean selectPreSelectRecordList(Integer pageNum, Integer pageSize, String salesBatchId, Integer houseId, Integer orgId, String phone, String apartmentId, Integer status);
+    ResponseBean selectPreSelectRecordList(PresecretRecordRequestBO recordRequestBO, Integer pageNum, Integer pageSize);
 
 }

src/main/java/com/huiju/estateagents/service/ITaRaiseRecordService.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.bo.request.HousingRaiseRequestBO;
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.entity.TaRaiseRecord;
@@ -20,27 +21,34 @@ import java.util.List;
  */
 public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
 
+
+    /**
+     * 条件查询房源认筹记录
+     *
+     * @param requestBO
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO, Integer pageNumber, Integer pageSize);
+
     /**
      * 条件查询认筹单
      *
      * @param recordRequestBO
-     * @param startTime
-     * @param endTime
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    ResponseBean listRaiseRecordByCondition(RaiseRecordRequestBO recordRequestBO, LocalDateTime startTime, LocalDateTime endTime, Integer pageNumber, Integer pageSize);
+    ResponseBean listRaiseRecordByCondition(RaiseRecordRequestBO recordRequestBO, Integer pageNumber, Integer pageSize);
 
     /**
      * 条件查询缴费单
      *
      * @param orderRequestBO
-     * @param payStartTime
-     * @param payEndTime
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    ResponseBean listRaiseOrderByCondition(RaiseOrderRequestBO orderRequestBO, LocalDateTime payStartTime, LocalDateTime payEndTime, Integer pageNumber, Integer pageSize);
+    ResponseBean listRaiseOrderByCondition(RaiseOrderRequestBO orderRequestBO, Integer pageNumber, Integer pageSize);
 }

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

@@ -6,6 +6,7 @@ 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.bo.request.PresecretRecordRequestBO;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.entity.TaApartmentImg;
@@ -215,10 +216,10 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
     }
 
     @Override
-    public ResponseBean selectPreSelectRecordList(Integer pageNum, Integer pageSize, String salesBatchId, Integer houseId, Integer orgId, String phone, String apartmentId, Integer status) {
+    public ResponseBean selectPreSelectRecordList(PresecretRecordRequestBO recordRequestBO, Integer pageNum, Integer pageSize) {
         Page page = new Page(pageNum, pageSize);
         // 分页查询
-        List<TaPreselectionRecord> list = taPreselectionRecordMapper.selectPreSelectRecordList(page, salesBatchId, houseId, orgId, phone, apartmentId, status);
+        List<TaPreselectionRecord> list = taPreselectionRecordMapper.selectPreSelectRecordList(page, recordRequestBO);
         page.setRecords(list);
         return ResponseBean.success(page);
     }

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

@@ -5,19 +5,18 @@ 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.bo.request.HousingRaiseRequestBO;
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.entity.TaRaiseRecord;
 import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
+import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
 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.List;
-
 /**
  * <p>
  * 认筹单(认筹记录表)  服务实现类
@@ -35,24 +34,32 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     private TaRaiseRecordMapper taRaiseRecordMapper;
 
     @Override
-    public ResponseBean listRaiseRecordByCondition(RaiseRecordRequestBO recordRequestBO, LocalDateTime startTime, LocalDateTime endTime, Integer pageNumber, Integer pageSize) {
-        logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},startTime:{},endTime:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(recordRequestBO),
-                startTime, endTime, pageNumber, pageSize);
+    public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO, Integer pageNumber, Integer pageSize) {
+        logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
+
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaHousingResourcesPO> pg = new Page<>(pageNumber, pageSize);
+        responseBean.addSuccess(taRaiseRecordMapper.listHousingRaiseByCondition(pg, requestBO));
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean listRaiseRecordByCondition(RaiseRecordRequestBO recordRequestBO, Integer pageNumber, Integer pageSize) {
+        logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(recordRequestBO), pageNumber, pageSize);
 
         ResponseBean responseBean = new ResponseBean();
         IPage<TaRaiseRecord> pg = new Page<>(pageNumber, pageSize);
-        responseBean.addSuccess(taRaiseRecordMapper.listRaiseRecordByCondition(pg, recordRequestBO, startTime, endTime));
+        responseBean.addSuccess(taRaiseRecordMapper.listRaiseRecordByCondition(pg, recordRequestBO));
         return responseBean;
     }
 
     @Override
-    public ResponseBean listRaiseOrderByCondition(RaiseOrderRequestBO orderRequestBO, LocalDateTime payStartTime, LocalDateTime payEndTime, Integer pageNumber, Integer pageSize) {
-        logger.info("TaRaiseRecordServiceImpl.listOrderByCondition 接收参数：bo:{},startTime:{},endTime:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(orderRequestBO),
-                payStartTime, payEndTime, pageNumber, pageSize);
+    public ResponseBean listRaiseOrderByCondition(RaiseOrderRequestBO orderRequestBO, Integer pageNumber, Integer pageSize) {
+        logger.info("TaRaiseRecordServiceImpl.listOrderByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(orderRequestBO), pageNumber, pageSize);
 
         ResponseBean responseBean = new ResponseBean();
         IPage<TaRaiseRecord> pg = new Page<>(pageNumber, pageSize);
-        responseBean.addSuccess(taRaiseRecordMapper.listRaiseOrderByCondition(pg, orderRequestBO, payStartTime, payEndTime));
+        responseBean.addSuccess(taRaiseRecordMapper.listRaiseOrderByCondition(pg, orderRequestBO));
         return responseBean;
     }
 }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -48,7 +48,6 @@
             t2.apartment_name,
             t3.term_id,
             t.term_name,
-            t4.house_locking_status,
             (select count(*) from ta_raise_house tr where tr.house_id = t.house_id) raiseRealHeat
         FROM
           ta_housing_resources t

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -52,42 +52,77 @@
     </select>
 
     <select id="selectPreSelectRecordList" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
-        select * from (
-        select t.house_id,
-        a.block_name,
-        a.unit_name,
-        a.floor_name,
-        a.room_name,
-        a.apartment_id,
-        b.nickname as nameOrnick,
-        b.`name`,
-        b.avatarurl,
-        b.phone,
-        a.term_name,
-        t.`status`,
-        t.update_date,
-        t.building_id,
-        t.sales_batch_id,
-        e.apartment_name,
-        b.person_id
-        from ta_preselection_record t
-        left join ta_housing_resources a on t.house_id = a.house_id
-        left join ta_person b on t.person_id = b.person_id
+
+        SELECT
+          *
+        FROM
+          (
+        SELECT
+            t.house_id,
+            a.block_name,
+            a.unit_name,
+            a.floor_name,
+            a.room_name,
+            a.apartment_id,
+            b.nickname AS nameOrnick,
+            b.`name`,
+            b.avatarurl,
+            b.phone,
+            a.term_name,
+            t.`status`,
+            t.update_date,
+            t.building_id,
+            t.sales_batch_id,
+            e.apartment_name,
+            b.person_id
+        FROM
+            ta_preselection_record t
+        LEFT JOIN ta_housing_resources a ON t.house_id = a.house_id
+        LEFT JOIN ta_person b ON t.person_id = b.person_id
         LEFT JOIN ta_building_apartment e ON a.apartment_id = e.apartment_id
-        where b.org_id = #{orgId} and a.sales_batch_id = #{salesBatchId}
-        <if test="houseId != null and houseId !=''">and t.house_id = #{houseId}
-        </if>
-        <if test="phone != null and phone != ''">
-            and b.
-            phone = #{phone}
-        </if>
-        <if test="apartmentId != null and apartmentId != ''">
-          and a.apartment_id = #{apartmentId}
-        </if>
-        <if test="status != null">
-          and t.status = #{status}
-        </if>
-        order by t.create_date desc) t group by t.house_id, t.person_id
+        WHERE
+            b.org_id = #{bo.orgId}
+            AND a.sales_batch_id =  #{bo.salesBatchId}
+            <if test="bo.termName != null and bo.termName != ''">
+                AND a.term_name like CONCAT('%',#{bo.termName}, '%')
+            </if>
+            <if test="bo.blockName != null and bo.blockName != ''">
+                AND a.block_name like CONCAT('%',#{bo.blockName}, '%')
+            </if>
+            <if test="bo.unitName != null and bo.unitName != ''">
+                AND a.unit_name like CONCAT('%',#{bo.unitName}, '%')
+            </if>
+            <if test="bo.floorName != null and bo.floorName != ''">
+                AND a.floor_name like CONCAT('%',#{bo.floorName}, '%')
+            </if>
+            <if test="bo.roomName != null and bo.roomName != ''">
+                AND a.room_name like CONCAT('%',#{bo.roomName}, '%')
+            </if>
+            <if test="bo.houseId != null and bo.houseId !=''">
+                AND t.house_id = #{houseId}
+            </if>
+            <if test="bo.phone != null and bo.phone != ''">
+                AND b.phone = #{bo.phone}
+            </if>
+            <if test="bo.apartmentId != null and bo.apartmentId != ''">
+                AND a.apartment_id = #{bo.apartmentId}
+            </if>
+            <if test="bo.status != null">
+                AND t.status = #{bo.status}
+            </if>
+            <if test="bo.startTime != null and bo.startTime != ''">
+                AND STR_TO_DATE(t.update_date, '%Y-%m-%d %H:%i:%s') &gt;= STR_TO_DATE(#{bo.startTime}, '%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="bo.endTime != null and bo.endTime != ''">
+                AND STR_TO_DATE(t.update_date, '%Y-%m-%d %H:%i:%s') &lt;= STR_TO_DATE(#{bo.endTime}, '%Y-%m-%d %H:%i:%s')
+            </if>
+        ORDER BY
+            t.create_date DESC
+        ) t
+        GROUP BY
+            t.house_id,
+            t.person_id
+
     </select>
 
 </mapper>

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -2,6 +2,55 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaRaiseRecordMapper">
 
+    <select id="listHousingRaiseByCondition" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
+        SELECT
+            t.*,
+            t4.apartment_name,
+            t2.raise_record_id,
+            (select count(*) from ta_raise_house tr where tr.house_id = t.house_id) raiseRealHeat
+        FROM
+            ta_housing_resources t
+            LEFT JOIN ta_raise_house t2 ON t.house_id = t2.house_id
+            LEFT JOIN ta_raise_record t3 ON t2.raise_record_id = t3.raise_record_id
+            LEFT JOIN ta_building_apartment t4 ON t.apartment_id = t4.apartment_id
+        WHERE
+            t.org_id = #{bo.orgId}
+            AND t.`status` != - 1
+            AND t4.`status` != - 1
+        <if test="bo.salesBatchId != null and bo.salesBatchId != ''">
+            AND t.sales_batch_id = #{bo.salesBatchId}
+        </if>
+        <if test="bo.termName != null and bo.termName != ''">
+            AND t.term_name like CONCAT('%',#{bo.termName}, '%')
+        </if>
+        <if test="bo.blockName != null and bo.blockName != ''">
+            AND t.block_name like CONCAT('%',#{bo.blockName}, '%')
+        </if>
+        <if test="bo.unitName != null and bo.unitName != ''">
+            AND t.unit_name like CONCAT('%',#{bo.unitName}, '%')
+        </if>
+        <if test="bo.floorName != null and bo.floorName != ''">
+            AND t.floor_name like CONCAT('%',#{bo.floorName}, '%')
+        </if>
+        <if test="bo.roomName != null and bo.roomName != ''">
+            AND t.room_name like CONCAT('%',#{bo.roomName}, '%')
+        </if>
+        <if test="bo.status != null">
+            AND t.`status` = #{bo.status}
+        </if>
+        <if test="bo.lockingStatus != null">
+            AND t.house_locking_status = #{bo.lockingStatus}
+        </if>
+        <if test="bo.apartmentId != null and t.apartmentId != ''">
+            AND t.apartment_id = #{bo.apartmentId}
+        </if>
+        <if test="bo.houseId != null">
+            AND t.house_id = #{bo.houseId}
+        </if>
+        ORDER BY
+          t3.create_date DESC
+    </select>
+
     <select id="listRaiseRecordByCondition" resultType="com.huiju.estateagents.entity.TaRaiseRecord">
         SELECT
             t.*,
@@ -66,12 +115,14 @@
         <if test="bo.payType != null and bo.payType != ''">
             AND t.pay_type = #{bo.payType}
         </if>
-        <if test = 'startTime != null'>
-            AND t.create_date &gt;= #{startTime}
+        <if test = "bo.startTime != null and bo.startTime != ''">
+            AND t.create_date &gt;= STR_TO_DATE(#{bo.startTime}, '%Y-%m-%d %H:%i:%s')
         </if>
-        <if test = 'endTime != null'>
-            AND t.create_date &lt;= #{endTime}
+        <if test = "bo.endTime != null and bo.endTime != ''">
+            AND t.create_date &lt;= STR_TO_DATE(#{bo.endTime}, '%Y-%m-%d %H:%i:%s')
         </if>
+        ORDER BY
+          t.create_date DESC
     </select>
 
     <select id ="listRaiseOrderByCondition" resultType="com.huiju.estateagents.entity.TaRaiseRecord">
@@ -114,11 +165,13 @@
             <if test = "bo.payStatus != null and bo.payStatus != ''">
                 AND t.pay_status = #{bo.payStatus}
             </if>
-            <if test = "payStartTime != null and payStartTime != ''">
-                AND t2.pay_time &gt;= #{payStartTime}
+            <if test = "bo.payStartTime != null and bo.payStartTime != ''">
+                AND t2.pay_time &gt;= STR_TO_DATE(#{bo.payStartTime}, '%Y-%m-%d %H:%i:%s')
             </if>
-            <if test = "payEndTime != null and payEndTime != ''">
-                AND t2.pay_time &lt;= #{payEndTime}
+            <if test = "bo.payEndTime != null and bo.payEndTime != ''">
+                AND t2.pay_time &lt;= STR_TO_DATE(#{bo.payEndTime}, '%Y-%m-%d %H:%i:%s')
             </if>
+        ORDER BY
+          t.create_date DESC
     </select>
 </mapper>