傅行帆 5 anni fa
parent
commit
f81225d3b6

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java Vedi File

239
         try {
239
         try {
240
             //使用分页插件
240
             //使用分页插件
241
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
241
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
242
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getDrainageVisitRecord(pg, getOrgId(request), activityName, drainageId, shareName, shareTel);
242
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getDrainageVisitRecord(pg, getOrgId(request), activityName, drainageId, shareName, shareTel,getTaPersonBuildingListByUserId(request));
243
             responseBean.addSuccess(result);
243
             responseBean.addSuccess(result);
244
             return responseBean;
244
             return responseBean;
245
         } catch (Exception e) {
245
         } catch (Exception e) {

+ 2
- 1
src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java Vedi File

3
 
3
 
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.baomidou.mybatisplus.core.metadata.IPage;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
6
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
7
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
7
 import org.apache.ibatis.annotations.Mapper;
8
 import org.apache.ibatis.annotations.Mapper;
8
 import org.apache.ibatis.annotations.Param;
9
 import org.apache.ibatis.annotations.Param;
69
      * @param orgId
70
      * @param orgId
70
      * @return
71
      * @return
71
      */
72
      */
72
-	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("drainageId") Integer drainageId, @Param("shareName") String shareName, @Param("shareTel") String shareTel);
73
+	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("drainageId") Integer drainageId, @Param("shareName") String shareName, @Param("shareTel") String shareTel,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
73
     IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType,@Param("personId") String personId);
74
     IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType,@Param("personId") String personId);
74
 
75
 
75
     IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventType") String eventType);
76
     IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventType") String eventType);

+ 2
- 1
src/main/java/com/huiju/estateagents/service/ITaPersonVisitRecordService.java Vedi File

4
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.baomidou.mybatisplus.extension.service.IService;
5
 import com.baomidou.mybatisplus.extension.service.IService;
6
 import com.huiju.estateagents.entity.TaPerson;
6
 import com.huiju.estateagents.entity.TaPerson;
7
+import com.huiju.estateagents.entity.TaPersonBuilding;
7
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
8
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
8
 
9
 
9
 import java.util.List;
10
 import java.util.List;
46
 //    IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
47
 //    IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
47
 //    TaPerson customerInfo(String personId);
48
 //    TaPerson customerInfo(String personId);
48
 
49
 
49
-	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel);
50
+	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel, List<TaPersonBuilding> taPersonBuildingList);
50
 }
51
 }

+ 3
- 9
src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java Vedi File

12
 import com.huiju.estateagents.common.CommConstant;
12
 import com.huiju.estateagents.common.CommConstant;
13
 import com.huiju.estateagents.drainage.entity.TaDrainage;
13
 import com.huiju.estateagents.drainage.entity.TaDrainage;
14
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
14
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
15
-import com.huiju.estateagents.entity.HelpActivity;
16
-import com.huiju.estateagents.entity.TaBuildingDynamic;
17
-import com.huiju.estateagents.entity.TaNews;
18
-import com.huiju.estateagents.entity.TaPerson;
19
-import com.huiju.estateagents.entity.TaPersonVisitRecord;
20
-import com.huiju.estateagents.entity.TaRecommendCustomer;
21
-import com.huiju.estateagents.entity.TaShareActivity;
15
+import com.huiju.estateagents.entity.*;
22
 import com.huiju.estateagents.mapper.HelpActivityMapper;
16
 import com.huiju.estateagents.mapper.HelpActivityMapper;
23
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
17
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
24
 import com.huiju.estateagents.mapper.TaNewsMapper;
18
 import com.huiju.estateagents.mapper.TaNewsMapper;
125
 	}
119
 	}
126
 
120
 
127
 	@Override
121
 	@Override
128
-	public IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel) {
129
-		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, drainageId, shareName, shareTel);
122
+	public IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel, List<TaPersonBuilding> taPersonBuildingList) {
123
+		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, drainageId, shareName, shareTel,taPersonBuildingList);
130
 		List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordIPage.getRecords();
124
 		List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordIPage.getRecords();
131
 		taPersonVisitRecords.forEach(e -> {
125
 		taPersonVisitRecords.forEach(e -> {
132
 			TaPerson personInfo = taPersonMapper.selectById(e.getPersonId());
126
 			TaPerson personInfo = taPersonMapper.selectById(e.getPersonId());

+ 6
- 0
src/main/resources/mapper/TaPersonVisitRecordMapper.xml Vedi File

148
             <if test="shareTel !=null and shareTel != ''">
148
             <if test="shareTel !=null and shareTel != ''">
149
                 and c.phone = #{shareTel}
149
                 and c.phone = #{shareTel}
150
             </if>
150
             </if>
151
+            <if test="personBuildingList != null and personBuildingList.size > 0">
152
+                AND t.building_id in
153
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
154
+                    #{personBuilding.buildingId}
155
+                </foreach>
156
+            </if>
151
             order by t.visit_time desc
157
             order by t.visit_time desc
152
         ) t
158
         ) t
153
         group by t.person_id, t.share_person_id
159
         group by t.person_id, t.share_person_id