傅行帆 5 vuotta sitten
vanhempi
commit
de6fd1a605

+ 2
- 2
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java Näytä tiedosto

10
 import org.apache.ibatis.annotations.Mapper;
10
 import org.apache.ibatis.annotations.Mapper;
11
 import org.apache.ibatis.annotations.Param;
11
 import org.apache.ibatis.annotations.Param;
12
 
12
 
13
-import java.time.LocalDateTime;
14
 import java.util.List;
13
 import java.util.List;
15
 import java.util.Map;
14
 import java.util.Map;
16
 
15
 
46
      * @param entryType
45
      * @param entryType
47
      * @param verifyStatus
46
      * @param verifyStatus
48
      * @param sex
47
      * @param sex
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);
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);
52
 
52
 
53
     /**
53
     /**
54
      * 导出数据 获取推荐用户数据
54
      * 导出数据 获取推荐用户数据

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java Näytä tiedosto

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);
495
+            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType, taPersonBuildingList);
496
         } else {
496
         } else {
497
             // 私客
497
             // 私客
498
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
498
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);

+ 6
- 0
src/main/resources/mapper/TaRecommendCustomerMapper.xml Näytä tiedosto

268
                 and b.tel like CONCAT('%',#{consultTel}, '%')
268
                 and b.tel like CONCAT('%',#{consultTel}, '%')
269
             </if>
269
             </if>
270
             and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
270
             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">
272
+                AND r.building_id in
273
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
274
+                    #{personBuilding.buildingId}
275
+                </foreach>
276
+            </if>
271
         </where>
277
         </where>
272
         order by b.create_date desc
278
         order by b.create_date desc
273
     </select>
279
     </select>