customerDetail

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

@@ -474,10 +474,12 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
-    public ResponseBean getCustomerDetail(@PathVariable String id) {
+    public ResponseBean getCustomerDetail(@PathVariable String id,
+                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -486,10 +488,12 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
-    public ResponseBean getPublicCustomerDetail(@PathVariable String id) {
+    public ResponseBean getPublicCustomerDetail(@PathVariable String id,
+                                                @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id));
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -7,6 +7,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -187,7 +188,7 @@ public class TaPerson implements Serializable {
      * 访问记录
      */
     @TableField(exist = false)
-    private List<TaPersonVisitRecord> visitRecords;
+    private IPage<TaPersonVisitRecord> visitRecords;
 
     @TableField(exist = false)
     private List<String> projects;

src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java

@@ -10,6 +10,7 @@ import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -154,7 +155,7 @@ public class TaRecommendCustomer implements Serializable {
     private Integer orgId;
 
     @TableField(exist = false)
-    private List<TaPersonVisitRecord> visitRecords;
+    private IPage<TaPersonVisitRecord> visitRecords;
 
     @TableField(exist = false)
     private List<String> projects;

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

@@ -24,7 +24,7 @@ import java.util.List;
 @Mapper
 public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecord> {
 
-    List<TaPersonVisitRecord> visitRecordByPersonId(@Param("personId") String personId);
+    IPage<TaPersonVisitRecord> visitRecordByPersonId(IPage<TaPersonVisitRecord> page,@Param("personId") String personId);
 
     /**
      * 行为分析的 列表

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

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

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

@@ -12,10 +12,7 @@ import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaBuilding;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
-import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
@@ -435,13 +432,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public TaRecommendCustomer getCustomerDetail(String customerId){
+    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize){
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
         TaPerson person = taPersonMapper.selectById(personId);
         if(!StringUtils.isEmpty(personId)){
-            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
-            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId));
+            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId).getRecords().size());
             taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
             Map<String,String>geoInfo = new HashMap<>();
             geoInfo.put("provience",person.getProvince());
@@ -469,11 +467,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public TaPerson getPublicCustomerDetail(String personId){
+    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize){
         TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
         if(!StringUtils.isEmpty(personId)){
-            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
-            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId));
+            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId).getRecords().size());
             taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
         }
         return taRecommendCustomer;