* bug

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

@@ -187,11 +187,17 @@ public class TaPreselectionRecordController extends BaseController {
     /**
      * 获取当前用户预选记录
      *
-     * @param pageNumber 页码
-     * @param pageSize   分页大小
-     * @param personId   用户ID
+     * @param buildingId
+     * @param salesBatchId
+     * @param apartmentId
+     * @param houseLockingStatus
+     * @param customerLocked
+     * @param pageNumber
+     * @param pageSize
+     * @param personId
+     * @param source             来源，raiseChoose 为认筹添加房源来源
+     * @param request
      * @return
-     * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.GET)
     public ResponseBean listPreselectionRecord(@RequestParam(value = "buildingId", required = false) String buildingId,
@@ -202,11 +208,13 @@ public class TaPreselectionRecordController extends BaseController {
                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                @RequestParam("personId") String personId,
+                                               @RequestParam("source") String source,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId, buildingId, salesBatchId, apartmentId, houseLockingStatus, customerLocked));
+            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId, buildingId,
+                    salesBatchId, apartmentId, houseLockingStatus, customerLocked, source));
         } catch (Exception e) {
             logger.error("listPreselectionRecord -=- {}", e);
             responseBean.addError(e.getMessage());

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

@@ -34,7 +34,8 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
     IPage<TaPreselectionRecordPO> listPreselectionRecord(IPage<TaPreselectionRecordPO> iPage,
                                                          @Param("orgId") Integer orgId,
                                                          @Param("personId") String personId, @Param("buildingId") String buildingId, @Param("salesBatchId") Integer salesBatchId,
-                                                         @Param("apartmentId") String apartmentId, @Param("houseLockingStatus") String houseLockingStatus, @Param("customerLocked") String customerLocked);
+                                                         @Param("apartmentId") String apartmentId, @Param("houseLockingStatus") String houseLockingStatus,
+                                                         @Param("customerLocked") String customerLocked, @Param("source") String source);
 
     /**
      * 根据房源ID和用户ID获取预选记录

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

@@ -28,7 +28,9 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      * @param personId
      * @return
      */
-    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId, Integer salesBatchId, String apartmentId, String houseLockingStatus, String customerLocked);
+    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId,
+                                                         Integer salesBatchId, String apartmentId, String houseLockingStatus, String customerLocked,
+                                                         String source);
 
     /**
      * 添加预选记录预选

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

@@ -68,11 +68,13 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
 
 
     @Override
-    public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId, Integer salesBatchId, String apartmentId, String houseLockingStatus, String customerLocked) {
-        logger.info("listPreselectionRecord 接收参数：pageNum：{}，pageSize：{}，orgId：{}，personId：{}", pageNum, pageSize, orgId, personId);
+    public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId,
+                                                                Integer salesBatchId, String apartmentId, String houseLockingStatus, String customerLocked,
+                                                                String source) {
+        logger.info("listPreselectionRecord 接收参数：pageNum：{}，pageSize：{}，orgId：{}，personId：{},source:{}", pageNum, pageSize, orgId, personId, source);
 
         IPage<TaPreselectionRecordPO> iPage = new Page<>(pageNum, pageSize);
-        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, orgId, personId, buildingId, salesBatchId, apartmentId, houseLockingStatus, customerLocked);
+        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, orgId, personId, buildingId, salesBatchId, apartmentId, houseLockingStatus, customerLocked, source);
 
         List<TaPreselectionRecordPO> poList = iPage.getRecords();
         if (CollectionUtils.isEmpty(poList)) {

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -47,7 +47,7 @@
         <if test = "source == 'raiseChoose'">
             AND ( t6.`status` != 0 OR t6.`status` IS NULL )
             AND (t.house_locking_status  != 'locked' OR t.house_locking_status IS NULL)
-            AND t7.raise_start_time &lt;= now( ) AND t7.raise_end_time &gt;= now()
+            AND t7.raise_start_time &lt;= now() AND t7.raise_end_time &gt;= now()
             <if test="personId != null and personId != ''">
                 AND (t6.person_id != #{personId} OR t6.person_id IS NULL)
             </if>

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -20,9 +20,15 @@
             ta_preselection_record t
         LEFT JOIN ta_housing_resources t2 ON t.house_id = t2.house_id
         LEFT JOIN ta_sales_batch t3 ON t.sales_batch_id = t3.sales_batch_id
+        <if test = "source == 'raiseChoose'">
+            LEFT JOIN ta_raise t4 ON t3.sales_batch_id = t4.sales_batch_id
+        </if>
         WHERE
             t.person_id = #{personId}
             AND t.org_id = #{orgId}
+        <if test="source == 'raiseChoose'">
+            AND t4.raise_start_time &lt;= now( ) AND t4.raise_end_time &gt;= now( )
+        </if>
         <if test="customerLocked == 'mine'">
             AND t2.house_locking_person = #{personId}
         </if>