傅行帆 5 年前
父节点
当前提交
4036841a04

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java 查看文件

70
      * @return
70
      * @return
71
      */
71
      */
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);
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> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType);
73
+    IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType,@Param("personId") String personId);
74
 
74
 
75
     IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventType") String eventType);
75
     IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventType") String eventType);
76
 }
76
 }

+ 6
- 1
src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java 查看文件

154
 	 */
154
 	 */
155
 	@Override
155
 	@Override
156
 	public IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId) {
156
 	public IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId) {
157
+		//根据userId获取用户信息
158
+		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
159
+		taPersonQueryWrapper.eq("user_id",userId);
160
+		taPersonQueryWrapper.eq("org_id",orgId);
161
+		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
157
 		//获取我的访问客户列表
162
 		//获取我的访问客户列表
158
-		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxVisitRecordList(pg,userId,orgId, CommConstant.EVENT_H5);
163
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxVisitRecordList(pg,userId,orgId, CommConstant.EVENT_H5,taPerson.getPersonId());
159
 		List<TaPersonVisitRecord> records = result.getRecords();
164
 		List<TaPersonVisitRecord> records = result.getRecords();
160
 		//判断是否我的客户状态
165
 		//判断是否我的客户状态
161
 		records.forEach(e -> {
166
 		records.forEach(e -> {

+ 1
- 1
src/main/resources/mapper/TaPersonVisitRecordMapper.xml 查看文件

99
 	        d.name as activity_name,
99
 	        d.name as activity_name,
100
 	        d.create_date
100
 	        d.create_date
101
         FROM
101
         FROM
102
-            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} ORDER BY visit_time DESC ) t
102
+            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC ) t
103
             left JOIN ta_person p on t.person_id = p.person_id
103
             left JOIN ta_person p on t.person_id = p.person_id
104
             LEFT join ta_drainage d on t.target_id = d.drainage_id
104
             LEFT join ta_drainage d on t.target_id = d.drainage_id
105
         GROUP BY
105
         GROUP BY