新需求筛选

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

@@ -194,14 +194,20 @@ public class TaPreselectionRecordController extends BaseController {
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.GET)
-    public ResponseBean listPreselectionRecord(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
-                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               @RequestParam("personId") String personId,
-                                               HttpServletRequest request) {
+    public ResponseBean listPreselectionRecord(
+                                                @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
+                                                @RequestParam(value = "apartmentId", required = false) String apartmentId,
+                                                @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
+                                                @RequestParam(value = "customerLocked", required = false) String customerLocked,
+                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @RequestParam("personId") String personId,
+                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId));
+            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId,buildingId,salesBtchId,apartmentId,houseLockingStatus,customerLocked));
         } catch (Exception e) {
             logger.error("listPreselectionRecord -=- {}", e);
             responseBean.addError(e.getMessage());

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

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

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

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

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

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

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -33,9 +33,31 @@
             t.person_id = #{personId}
             AND t.org_id = #{orgId}
             AND t.house_id = t2.house_id
+            <if test="buildingId != null and buildingId != ''">
+                t.building_id = #{buildingId}
+            </if>
+            <if test="salesBtchId != null and salesBtchId != ''">
+                t2.sales_batch_id = #{salesBtchId}
+            </if>
+            <if test="apartmentId != null and apartmentId != ''">
+                t2.apartment_id = #{apartmentId}
+            </if>
+            <if test="houseLockingStatus = 'locked'">
+                t2.house_locking_status = 'locked'
+            </if>
+            <if test="houseLockingStatus = 'unlocked'">
+                t2.house_locking_status != 'locked'
+            </if>
             ) t3
             LEFT JOIN ta_building t4 ON t3.buildingId = t4.building_id
             LEFT JOIN ta_sales_batch t5 ON t3.saleBatchId = t5.sales_batch_id
+            left join ta_raise_house t6 on t3.house_id = t6.house_id
+            <if test="customerLocked = 'mine'">
+                t6.person_id = #{personId}
+            </if>
+            <if test="customerLocked = 'other'">
+                t6.person_id != #{personId}
+            </if>
          ORDER BY
             t3.create_date DESC
     </select>