傅行帆 5 years ago
parent
commit
dd3145976b

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java View File

48
      * @param personBuildingList
48
      * @param personBuildingList
49
      * @return
49
      * @return
50
      */
50
      */
51
-    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel, @Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
51
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel, @Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("buildingId") String buildingId);
52
 
52
 
53
     /**
53
     /**
54
      * 导出数据 获取推荐用户数据
54
      * 导出数据 获取推荐用户数据

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java View File

492
             // 公客
492
             // 公客
493
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
493
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
494
             // 公客就不用 buildingId 进行查询
494
             // 公客就不用 buildingId 进行查询
495
-            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType, taPersonBuildingList);
495
+            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType, taPersonBuildingList,building);
496
         } else {
496
         } else {
497
             // 私客
497
             // 私客
498
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
498
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);

+ 3
- 0
src/main/resources/mapper/TaRecommendCustomerMapper.xml View File

267
             <if test="consultTel != null and consultTel !=''">
267
             <if test="consultTel != null and consultTel !=''">
268
                 and b.tel like CONCAT('%',#{consultTel}, '%')
268
                 and b.tel like CONCAT('%',#{consultTel}, '%')
269
             </if>
269
             </if>
270
+            <if test="buildingId != null and buildingId !=''">
271
+                AND r.building_id = #{buildingId}
272
+            </if>
270
             and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
273
             and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
271
             <if test="personBuildingList != null and personBuildingList.size > 0">
274
             <if test="personBuildingList != null and personBuildingList.size > 0">
272
                 AND r.building_id in
275
                 AND r.building_id in