傅行帆 преди 5 години
родител
ревизия
970fac392a

+ 7
- 4
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Целия файл

522
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
522
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
523
     public ResponseBean getCustomerDetail(@PathVariable String id,
523
     public ResponseBean getCustomerDetail(@PathVariable String id,
524
                                           @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
524
                                           @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
525
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
525
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
526
+                                          @RequestParam(value ="buildingId",required = false) String buildingId,
527
+                                          HttpServletRequest request) {
526
         ResponseBean responseBean = new ResponseBean();
528
         ResponseBean responseBean = new ResponseBean();
527
         try {
529
         try {
528
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
530
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request),buildingId));
529
         }catch (Exception e){
531
         }catch (Exception e){
530
             e.printStackTrace();
532
             e.printStackTrace();
531
             responseBean.addError(e.getMessage());
533
             responseBean.addError(e.getMessage());
536
     @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
538
     @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
537
     public ResponseBean getPublicCustomerDetail(@PathVariable String id,
539
     public ResponseBean getPublicCustomerDetail(@PathVariable String id,
538
                                                 @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
540
                                                 @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
539
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
541
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
542
+                                                @RequestParam(value ="buildingId",required = false) String buildingId,HttpServletRequest request) {
540
         ResponseBean responseBean = new ResponseBean();
543
         ResponseBean responseBean = new ResponseBean();
541
         try {
544
         try {
542
-            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
545
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request),buildingId));
543
         }catch (Exception e){
546
         }catch (Exception e){
544
             e.printStackTrace();
547
             e.printStackTrace();
545
             responseBean.addError(e.getMessage());
548
             responseBean.addError(e.getMessage());

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java Целия файл

27
 @Mapper
27
 @Mapper
28
 public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecord> {
28
 public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecord> {
29
 
29
 
30
-    IPage<TaPersonVisitRecord> visitRecordByPersonId(IPage<TaPersonVisitRecord> page,@Param("personId") String personId);
30
+    IPage<TaPersonVisitRecord> visitRecordByPersonId(IPage<TaPersonVisitRecord> page,@Param("personId") String personId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("buildingId") String buildingId);
31
 
31
 
32
     Integer getDurationByPersonId(@Param("personId") String personId);
32
     Integer getDurationByPersonId(@Param("personId") String personId);
33
 
33
 

+ 2
- 2
src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java Целия файл

44
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
44
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
45
 
45
 
46
 
46
 
47
-    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
47
+    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
48
 
48
 
49
-    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
49
+    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
50
 
50
 
51
     TaRecommendCustomer getCustomerById(String customerId);
51
     TaRecommendCustomer getCustomerById(String customerId);
52
 
52
 

+ 4
- 4
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java Целия файл

521
 
521
 
522
 
522
 
523
     @Override
523
     @Override
524
-    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
524
+    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
525
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
525
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
526
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
526
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
527
         TaPerson person = taPersonMapper.selectById(personId);
527
         TaPerson person = taPersonMapper.selectById(personId);
528
         if(!StringUtils.isEmpty(personId)){
528
         if(!StringUtils.isEmpty(personId)){
529
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
529
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
530
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId);
530
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
531
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
531
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
532
             records.forEach(e -> {
532
             records.forEach(e -> {
533
                 //获取活动标题
533
                 //获取活动标题
611
     }
611
     }
612
 
612
 
613
     @Override
613
     @Override
614
-    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
614
+    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
615
         TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
615
         TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
616
         if(!StringUtils.isEmpty(personId)){
616
         if(!StringUtils.isEmpty(personId)){
617
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
617
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
618
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId);
618
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
619
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
619
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
620
             records.forEach(e -> {
620
             records.forEach(e -> {
621
                 //获取活动标题
621
                 //获取活动标题

+ 12
- 3
src/main/resources/mapper/TaPersonVisitRecordMapper.xml Целия файл

23
     </sql>
23
     </sql>
24
 
24
 
25
     <select id="visitRecordByPersonId" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
25
     <select id="visitRecordByPersonId" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
26
-        select * from ta_person_visit_record
27
-        where person_id = #{personId}
28
-        order by visit_time desc
26
+        select * from ta_person_visit_record t
27
+        where t.person_id = #{personId}
28
+        <if test="personBuildingList != null and personBuildingList.size > 0">
29
+            AND t.building_id in
30
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
31
+                #{personBuilding.buildingId}
32
+            </foreach>
33
+        </if>
34
+        <if test="buildingId != null and buildingId != ''">
35
+            AND t.building_id = #{buildingId}
36
+        </if>
37
+        order by t.visit_time desc
29
     </select>
38
     </select>
30
 
39
 
31
     <select id="selectAll" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
40
     <select id="selectAll" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">