bug

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

@@ -522,10 +522,12 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
     public ResponseBean getCustomerDetail(@PathVariable String id,
                                           @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value ="buildingId",required = false) String buildingId,
+                                          HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request),buildingId));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -536,10 +538,11 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
     public ResponseBean getPublicCustomerDetail(@PathVariable String id,
                                                 @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value ="buildingId",required = false) String buildingId,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request),buildingId));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());

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

@@ -27,7 +27,7 @@ import java.util.List;
 @Mapper
 public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecord> {
 
-    IPage<TaPersonVisitRecord> visitRecordByPersonId(IPage<TaPersonVisitRecord> page,@Param("personId") String personId);
+    IPage<TaPersonVisitRecord> visitRecordByPersonId(IPage<TaPersonVisitRecord> page,@Param("personId") String personId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("buildingId") String buildingId);
 
     Integer getDurationByPersonId(@Param("personId") String personId);
 

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

@@ -44,9 +44,9 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 
 
-    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
+    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
 
-    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
+    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
 
     TaRecommendCustomer getCustomerById(String customerId);
 

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

@@ -521,13 +521,13 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
+    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
         TaPerson person = taPersonMapper.selectById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId);
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
                 //获取活动标题
@@ -611,11 +611,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
+    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
         TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId);
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
                 //获取活动标题

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -23,9 +23,18 @@
     </sql>
 
     <select id="visitRecordByPersonId" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-        select * from ta_person_visit_record
-        where person_id = #{personId}
-        order by visit_time desc
+        select * from ta_person_visit_record t
+        where t.person_id = #{personId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            AND t.building_id = #{buildingId}
+        </if>
+        order by t.visit_time desc
     </select>
 
     <select id="selectAll" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">