H5活动

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

@@ -254,11 +254,15 @@ public class TaPersonVisitRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/visitRecord/activity",method= RequestMethod.GET)
-    public ResponseBean wxVisitRecordList(@RequestParam(value = "userId") Integer userId,
+    public ResponseBean wxVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value = "userId") Integer userId,
                                           @RequestParam(value = "personId") String personId,
                                           HttpServletRequest request){
         try {
-            List<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordActivityList(userId,personId,getOrgId(request));
+            //使用分页插件
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordActivityList(pg, userId,personId,getOrgId(request));
             return ResponseBean.success(result);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -65,5 +65,5 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
 
     IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType);
 
-    List<TaPersonVisitRecord> getWxVisitRecordActivityList(@Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventH5") String eventH5);
+    IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventType") String eventType);
 }

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

@@ -32,7 +32,7 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 	 * @param orgId
 	 * @return
 	 */
-    IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId);
+	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId);
 
 	/**
 	 * 获取这个人的活动数据列表
@@ -41,7 +41,7 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 	 * @param orgId
 	 * @return
 	 */
-	List<TaPersonVisitRecord> getWxVisitRecordActivityList(Integer userId, String personId, Integer orgId);
+	IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg, Integer userId, String personId, Integer orgId);
 
 //    IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
 //    TaPerson customerInfo(String personId);

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

@@ -140,7 +140,7 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				e.setMyCustomer(CommConstant.STATUS_NORMAL);
 			}
 		});
-		return null;
+		return result;
 	}
 
 	/**
@@ -152,8 +152,8 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	 * @return
 	 */
 	@Override
-	public List<TaPersonVisitRecord> getWxVisitRecordActivityList(Integer userId, String personId, Integer orgId) {
-		return personVisitRecordMapper.getWxVisitRecordActivityList(userId,personId,orgId,CommConstant.EVENT_H5);
+	public IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg,Integer userId, String personId, Integer orgId) {
+		return personVisitRecordMapper.getWxVisitRecordActivityList(pg,userId,personId,orgId,CommConstant.EVENT_H5);
 	}
 
 //    @Autowired

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -71,11 +71,14 @@
     </select>
     <select id="getWxVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         SELECT
-            * ,
-	        p.`name` as user_name
+            t.* ,
+	        p.`name` as user_name,
+	        d.name as activity_name,
+	        d.create_date
         FROM
             ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} ORDER BY visit_time DESC ) t
             left JOIN ta_person p on t.person_id = p.person_id
+            LEFT join ta_drainage d on t.target_id = d.drainage_id
         GROUP BY
             t.person_id
         ORDER BY