|
@@ -541,10 +541,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
and o.company_id=#{companyId}
|
|
and o.company_id=#{companyId}
|
|
</if>
|
|
</if>
|
|
<if test= 'sTime != null '>
|
|
<if test= 'sTime != null '>
|
|
- and o.create_time >= #{startDate}
|
|
|
|
|
|
+ and o.create_time >= #{sTime}
|
|
</if>
|
|
</if>
|
|
<if test='eTime != null '>
|
|
<if test='eTime != null '>
|
|
- and o.create_time <= #{endDate}
|
|
|
|
|
|
+ and o.create_time <= #{eTime}
|
|
</if>
|
|
</if>
|
|
<if test ='courseId !=null'>
|
|
<if test ='courseId !=null'>
|
|
and o.course_id = #{courseId}
|
|
and o.course_id = #{courseId}
|
|
@@ -566,7 +566,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
GROUP BY o.video_id,o.user_id,DATE(o.create_time),o.project,o.course_id
|
|
GROUP BY o.video_id,o.user_id,DATE(o.create_time),o.project,o.course_id
|
|
ORDER BY o.video_id ,DATE(o.create_time)
|
|
ORDER BY o.video_id ,DATE(o.create_time)
|
|
|
|
|
|
- limit ${(maps.pageNum-1)*maps.pageSize},${maps.pageSize}
|
|
|
|
|
|
+ limit ${(pageNum-1)*pageSize},${pageSize}
|
|
</select>
|
|
</select>
|
|
<select id="selectFsCourseWatchLogListVONew" resultType="com.fs.course.vo.FsCourseWatchLogListVO">
|
|
<select id="selectFsCourseWatchLogListVONew" resultType="com.fs.course.vo.FsCourseWatchLogListVO">
|
|
SELECT
|
|
SELECT
|