看课记录的导出

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

@@ -62,13 +62,17 @@ public class FsCourseWatchLogController extends BaseController
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setCompanyId( loginUser.getCompany().getCompanyId());
-        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVONew(param);
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(HttpStatus.SUCCESS);
-        rspData.setMsg("查询成功");
-        rspData.setRows(list);
-        rspData.setTotal(fsCourseWatchLogService.selectFsCourseWatchLogListVOCount(param));
-        return rspData;
+
+        startPage();
+//        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVONew(param);
+//        TableDataInfo rspData = new TableDataInfo();
+//        rspData.setCode(HttpStatus.SUCCESS);
+//        rspData.setMsg("查询成功");
+//        rspData.setRows(list);
+//        rspData.setTotal(fsCourseWatchLogService.selectFsCourseWatchLogListVOCount(param));
+        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVOexport(param);
+
+        return getDataTable(list);
     }
 
     @PreAuthorize("@ss.hasPermi('course:courseWatchLog:statisticsList')")
@@ -185,13 +189,17 @@ public class FsCourseWatchLogController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setCompanyId( loginUser.getCompany().getCompanyId());
         param.setCompanyUserId(loginUser.getUser().getUserId());
-        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVONew(param);
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(HttpStatus.SUCCESS);
-        rspData.setMsg("查询成功");
-        rspData.setRows(list);
-        rspData.setTotal(fsCourseWatchLogService.selectFsCourseWatchLogListVOCount(param));
-        return rspData;
+//        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVONew(param);
+//        TableDataInfo rspData = new TableDataInfo();
+//        rspData.setCode(HttpStatus.SUCCESS);
+//        rspData.setMsg("查询成功");
+//        rspData.setRows(list);
+//        rspData.setTotal(fsCourseWatchLogService.selectFsCourseWatchLogListVOCount(param));
+//        return rspData;
+
+        startPage();
+        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVOexport(param);
+        return getDataTable(list);
     }
 
     /**
@@ -219,6 +227,7 @@ public class FsCourseWatchLogController extends BaseController
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setCompanyId( loginUser.getCompany().getCompanyId());
+        param.setCompanyUserId(loginUser.getUser().getUserId());
         List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVOexport(param);
         ExcelUtil<FsCourseWatchLogListVO> util = new ExcelUtil<FsCourseWatchLogListVO>(FsCourseWatchLogListVO.class);
         return util.exportExcel(list, "短链课程看课记录数据");

fs-service-system/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -133,18 +133,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectFsCourseWatchLogListVOexport" resultType="com.fs.course.vo.FsCourseWatchLogListVO">
-        select l.log_id,l.user_id,uc.course_name,v.title as video_name,qec.avatar as external_user_avatar,
+        select l.log_id,
+        l.project as project,
+        l.user_id,uc.course_name,v.title as video_name,u.nick_name as fsNickName, u.avatar as fsAvatar,
         l.log_type,SEC_TO_TIME(l.duration) as duration,c.company_name,l.camp_period_time,l.finish_time,
-        cu.nick_name as company_user_name ,l.send_type,l.create_time,l.update_time,l.last_heartbeat_time,
-        qu.qw_user_name,qec.name as external_user_name,c.company_id
+        cu.nick_name as company_user_name ,l.send_type,l.create_time,l.update_time,l.last_heartbeat_time,c.company_id
         from fs_course_watch_log l
         left join fs_user_course_video v on v.video_id = l.video_id
         left join fs_user_course uc on uc.course_id = l.course_id
         left join fs_user u on u.user_id = l.user_id
         left join company_user cu on cu.user_id = l.company_user_id
         left join company c on c.company_id = l.company_id
-        LEFT JOIN qw_user qu on qu.id= l.qw_user_id
-        LEFT JOIN qw_external_contact qec on l.qw_external_contact_id = qec.id
         <where>
             <if test ='maps.userId !=null'>
                 and l.user_id = #{maps.userId}
@@ -176,9 +175,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test ='maps.nickName !=null and maps.nickName!=""'>
                 and u.nick_name  like concat('%', #{maps.nickName}, '%')
             </if>
-            <if test ='maps.externalUserName !=null and maps.externalUserName!=""'>
-                and qec.name  like concat('%', #{maps.externalUserName}, '%')
-            </if>
             <if test= 'maps.sTime != null '>
                 and DATE(l.create_time) &gt;= DATE(#{maps.sTime})
             </if>
@@ -204,7 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
-        order by l.finish_time asc,l.update_time desc
+        order by l.log_id desc
     </select>
 
     <select id="selectFsCourseWatchLogListByParam" resultType="com.fs.course.vo.FsCourseWatchLogListVO">
@@ -692,7 +688,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and send_type = #{maps.sourceType}
             </if>
             <if test="maps.sopIds != null and maps.sopIds.size() > 0">
-                and sop_id in
                 AND sop_id IN
                 <foreach item="sopId" index="index" collection="maps.sopIds" open="(" separator="," close=")">
                     #{sopId}