优化查询列表

fs-company/src/main/java/com/fs/company/controller/course/FsCourseWatchLogController.java

@@ -1,6 +1,7 @@
 package com.fs.company.controller.course;
 
 import com.fs.common.annotation.Log;
+import com.fs.common.constant.HttpStatus;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.page.TableDataInfo;
@@ -178,14 +179,26 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/watchLogStatistics")
     public TableDataInfo watchLogStatistics(FsCourseOverParam param)
     {
-        startPage();
+//        startPage();
+//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany().getCompanyId());
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
+//        return getDataTable(list);
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setCompanyId( loginUser.getCompany().getCompanyId());
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
         }
-        List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
-        return getDataTable(list);
+        List<FsCourseOverVO> list =fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVOCount(param));
+        return rspData;
     }
     @GetMapping("/watchLogStatisticsExport")
     public AjaxResult watchLogStatisticsExport(FsCourseOverParam param)

fs-company/src/main/java/com/fs/company/controller/course/qw/FsQwCourseWatchLogController.java

@@ -1,6 +1,7 @@
 package com.fs.company.controller.course.qw;
 
 import com.fs.common.annotation.Log;
+import com.fs.common.constant.HttpStatus;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.page.TableDataInfo;
@@ -148,14 +149,26 @@ public class FsQwCourseWatchLogController extends BaseController
     @GetMapping("/watchLogStatistics")
     public TableDataInfo watchLogStatistics(FsCourseOverParam param)
     {
-        startPage();
+//        startPage();
+//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setCompanyId( loginUser.getCompany().getCompanyId());
+//        if (param.getSTime()==null||param.getETime()==null){
+//            return getDataTable(new ArrayList<>());
+//        }
+//        List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
+//        return getDataTable(list);
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setCompanyId( loginUser.getCompany().getCompanyId());
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
         }
         List<FsCourseOverVO> list = fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVO(param);
-        return getDataTable(list);
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(fsCourseWatchLogService.selectFsCourseWatchLogOverStatisticsListVOCount(param));
+        return rspData;
     }
     @GetMapping("/watchLogStatisticsExport")
     public AjaxResult watchLogStatisticsExport(FsCourseOverParam param)

fs-service/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java

@@ -311,6 +311,23 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
     @DataSource(DataSourceType.SLAVE)
     List<FsCourseOverVO> selectFsCourseWatchLogOverStatisticsListVO(FsCourseOverParam param);
 
+    @Select({"<script> " +
+            "select COUNT(*) from fs_course_watch_log o " +
+            "LEFT JOIN qw_user qu on qu.id=o.qw_user_id " +
+            "LEFT JOIN qw_external_contact ext ON ext.id =  o.qw_external_contact_id where log_type=2 and o.company_id=#{companyId} " +
+            "<if test= 'sTime != null '> " +
+            "       and DATE(o.create_time) &gt;= DATE(#{sTime})\n" +
+            "</if>\n" +
+            "<if test='eTime != null '> " +
+            "      and DATE(o.create_time) &lt;= DATE(#{eTime})\n" +
+            "</if>" +
+            "<if test ='nickName !=null and nickName!=\"\"'>\n" +
+            "   and qu.qw_user_name like concat('%', #{nickName}, '%')\n" +
+            "</if>"+
+            " GROUP BY o.qw_external_contact_id"+
+            "</script>"})
+    long selectFsCourseWatchLogOverStatisticsListVOCount(FsCourseOverParam param);
+
 
     void batchUpdateWatchLogSendMsg(@Param("list") List<FsCourseWatchLog> logs);
 

fs-service/src/main/java/com/fs/course/service/IFsCourseWatchLogService.java

@@ -98,6 +98,7 @@ public interface IFsCourseWatchLogService extends IService<FsCourseWatchLog> {
     List<FsCourseUserStatisticsListVO> selectFsCourseUserStatisticsListVO(FsCourseUserStatisticsListParam param);
 
     List<FsCourseOverVO> selectFsCourseWatchLogOverStatisticsListVO(FsCourseOverParam param);
+    long selectFsCourseWatchLogOverStatisticsListVOCount(FsCourseOverParam param);
 
     void addCourseWatchLogDay();
 

fs-service/src/main/java/com/fs/course/service/impl/FsCourseWatchLogServiceImpl.java

@@ -872,6 +872,11 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
         return fsCourseWatchLogMapper.selectFsCourseWatchLogOverStatisticsListVO(param);
     }
 
+    @Override
+    public long selectFsCourseWatchLogOverStatisticsListVOCount(FsCourseOverParam param) {
+        return fsCourseWatchLogMapper.selectFsCourseWatchLogOverStatisticsListVOCount(param);
+    }
+
     @Override
     public void addCourseWatchLogDay() {