Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

@@ -705,16 +705,15 @@ public class HmLinkController {
                 .responsePage(DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_link_detail, param));
     }
 
-    // 加好友列表
+    /**
+     * com.gic.haoban.manage.web.controller.hm.HmQrcodeController.wxUserAddLogList 一样
+     */
     @RequestMapping("statistics/log")
-    public RestResponse<Object> statisticsDetail(Long linkId, String clerkId, Date startTime, Date endTime,
-            BasePageInfo basePageInfo) {
-        WxUserAddLogSearchQDTO qdto = new WxUserAddLogSearchQDTO();
-        qdto.setLinkId(linkId);
-        qdto.setClerkId(clerkId);
-        qdto.setStartTime(startTime);
-        qdto.setEndTime(endTime);
-        ServiceResponse<Page<WxUserAddLogDTO>> pageResp = this.wxUserAddLogApiService.page(qdto, basePageInfo);
+    public RestResponse<Object> statisticsDetail(@RequestBody WxUserAddLogSearchQDTO qdto) {
+        BasePageInfo pageInfo = new BasePageInfo();
+        pageInfo.setPageNum(qdto.getPageNum());
+        pageInfo.setPageSize(qdto.getPageSize());
+        ServiceResponse<Page<WxUserAddLogDTO>> pageResp = this.wxUserAddLogApiService.page(qdto, pageInfo);
         Page<WxUserAddLogVO> retPage = PageHelperUtils.changePageHelperToCurrentPage(pageResp.getResult().getResult(),
                 WxUserAddLogVO.class);
         return RestResponse.successResult(retPage);