视频分析加入检索

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/StudyBehaviorProgressController.java

@@ -42,7 +42,7 @@ public class StudyBehaviorProgressController {
     @GetMapping("/disk/studyBehavior/courseVisitProgress")
     public CommonResult<Map<String,Object>> courseVisitProgress(HttpServletRequest req) {
         Map param =new HashMap();
-        param.put("courseId", req.getParameter("courseId"));
+        param.put("orgId", req.getParameter("orgId"));
         param.put("startTime", req.getParameter("startTime"));
         param.put("endTime", req.getParameter("endTime"));
 
@@ -61,7 +61,7 @@ public class StudyBehaviorProgressController {
     @GetMapping("/disk/studyBehavior/userLoginProgress")
     public CommonResult<Map<String,Object>> userLoginProgress(HttpServletRequest req) {
         Map param =new HashMap();
-        param.put("courseId", req.getParameter("courseId"));
+        param.put("orgId", req.getParameter("orgId"));
         param.put("startTime", req.getParameter("startTime"));
         param.put("endTime", req.getParameter("endTime"));
 
@@ -80,7 +80,7 @@ public class StudyBehaviorProgressController {
     @GetMapping("/disk/studyBehavior/watchDurationProgress")
     public CommonResult<Map<String,Object>> watchDurationProgress(HttpServletRequest req) {
         Map param =new HashMap();
-        param.put("courseId", req.getParameter("courseId"));
+        param.put("orgId", req.getParameter("orgId"));
         param.put("startTime", req.getParameter("startTime"));
         param.put("endTime", req.getParameter("endTime"));
 
@@ -99,7 +99,7 @@ public class StudyBehaviorProgressController {
     @GetMapping("/disk/studyBehavior/loginFrameDistribution")
     public CommonResult<Page<Map<String,Object>>> loginFrameDistribution(HttpServletRequest req) {
         Map param =new HashMap();
-        param.put("courseId", req.getParameter("courseId"));
+        param.put("orgId", req.getParameter("orgId"));
         param.put("startTime", req.getParameter("startTime"));
         param.put("endTime", req.getParameter("endTime"));
         Page<Map<String,Object>> list=studyBehaviorProgressService.getLoginFrameDistribution(param);
@@ -117,7 +117,7 @@ public class StudyBehaviorProgressController {
     @GetMapping("/disk/studyBehavior/courseVisitHeatRank")
     public CommonResult<Page<Map<String,Object>>> courseVisitHeatRank(HttpServletRequest req) {
         Map param =new HashMap();
-        param.put("courseId", req.getParameter("courseId"));
+        param.put("orgId", req.getParameter("orgId"));
         param.put("startTime", req.getParameter("startTime"));
         param.put("endTime", req.getParameter("endTime"));
         Page<Map<String,Object>> list=studyBehaviorProgressService.getCourseVisitHeatRank(param);
@@ -135,7 +135,7 @@ public class StudyBehaviorProgressController {
     @GetMapping("/disk/studyBehavior/collegeCourseDetailProgress")
     public CommonResult<Page<Map<String,Object>>> collegeCourseDetailProgress(HttpServletRequest req) {
         Map param =new HashMap();
-        param.put("courseId", req.getParameter("courseId"));
+        param.put("orgId", req.getParameter("orgId"));
         param.put("startTime", req.getParameter("startTime"));
         param.put("endTime", req.getParameter("endTime"));
         Page<Map<String,Object>> list=studyBehaviorProgressService.getCollegeCourseDetailProgress(param);
@@ -153,9 +153,7 @@ public class StudyBehaviorProgressController {
     @GetMapping("/disk/studyBehavior/studentAnalyse")
     public CommonResult<Page<Map<String,Object>>> studentAnalyse(HttpServletRequest req) {
         Map param =new HashMap();
-        param.put("courseId", req.getParameter("courseId"));
-        param.put("startTime", req.getParameter("startTime"));
-        param.put("endTime", req.getParameter("endTime"));
+        param.put("name", req.getParameter("name"));
         Page<Map<String,Object>> list=studyBehaviorProgressService.getStudentAnalyse(param);
         return CommonResult.data(list);
     }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/VideoAnalysisProgressMapper.xml

@@ -31,8 +31,22 @@
                 AND stu.ID IS NOT NULL
                 AND stu.EDU_IDENTITY='2'
                      --		AND csb.USER_ID='1948586504800468993'
+                <if test="courseId !=null and courseId != ''">
+                    and ci.COURSE_ID=#{courseId}
+                </if>
             )t1
-            LEFT JOIN (SELECT csb1.USER_ID,csb1.HOUR_ID FROM COURSE_STUDENT_BURIALPOINT csb1 WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1' GROUP BY csb1.USER_ID,csb1.HOUR_ID) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
+            LEFT JOIN (
+                SELECT csb1.USER_ID,csb1.HOUR_ID
+                FROM COURSE_STUDENT_BURIALPOINT csb1
+                WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1'
+                <if test="startTime!=null and startTime != ''">
+                    and csb1.CREATE_TIME &gt;=#{startTime}
+                </if>
+                <if test="endTime!=null and endTime != ''">
+                    and csb1.CREATE_TIME &lt;=#{endTime}
+                </if>
+                GROUP BY csb1.USER_ID,csb1.HOUR_ID
+            ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
             WHERE 1=1
                   --	AND t1.courseId='1954728193252552705'
             GROUP BY t1.userId
@@ -74,6 +88,9 @@
                     AND cc.ID IS NOT NULL
                     AND ci.COURSE_ID IS NOT NULL
                     AND stu.ID IS NOT NULL
+                    <if test="courseId !=null and courseId != ''">
+                        and ci.COURSE_ID=#{courseId}
+                    </if>
                 )t2
                 WHERE 1=1
                 --	AND t2.courseId='1954728193252552705'
@@ -104,8 +121,22 @@
                     AND ci.COURSE_ID IS NOT NULL
                     AND stu.ID IS NOT NULL
                     --		AND csb.USER_ID='1948586504800468993'
+                    <if test="courseId !=null and courseId != ''">
+                        and ci.COURSE_ID=#{courseId}
+                    </if>
                 )t1
-                LEFT JOIN (SELECT csb1.USER_ID,csb1.HOUR_ID FROM COURSE_STUDENT_BURIALPOINT csb1 WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1' GROUP BY csb1.USER_ID,csb1.HOUR_ID) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
+                LEFT JOIN (
+                    SELECT csb1.USER_ID,csb1.HOUR_ID
+                    FROM COURSE_STUDENT_BURIALPOINT csb1
+                    WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1'
+                    <if test="startTime!=null and startTime != ''">
+                        and csb1.CREATE_TIME &gt;=#{startTime}
+                    </if>
+                    <if test="endTime!=null and endTime != ''">
+                        and csb1.CREATE_TIME &lt;=#{endTime}
+                    </if>
+                    GROUP BY csb1.USER_ID,csb1.HOUR_ID
+                ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
                 WHERE 1=1
                 --	AND t1.courseId='1954728193252552705'
                 GROUP BY t1.userId
@@ -162,6 +193,9 @@
                             AND ci.COURSE_ID IS NOT NULL
                             AND stu.ID IS NOT NULL
                             AND stu.EDU_IDENTITY='2'
+                            <if test="courseId !=null and courseId != ''">
+                                and ci.COURSE_ID=#{courseId}
+                            </if>
                         )t2
                         WHERE 1=1
                         --	AND t2.courseId='1954728193252552705'
@@ -176,11 +210,11 @@
                             IFNULL(COUNT(csb.HOUR_ID AS hourId),0) AS alreadyCount
                         FROM (
                             SELECT
-                            cop.ID AS copId,
-                            stu.ID AS userId,
-                            cch.ID AS hourId,
-                            cc.ID AS chapterId,
-                            ci.COURSE_ID AS courseId
+                                cop.ID AS copId,
+                                stu.ID AS userId,
+                                cch.ID AS hourId,
+                                cc.ID AS chapterId,
+                                ci.COURSE_ID AS courseId
                             FROM COURSE_INFO ci
                             LEFT JOIN COURSE_OPEN cop ON ci.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
                             LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'
@@ -193,8 +227,22 @@
                             AND stu.ID IS NOT NULL
                             AND stu.EDU_IDENTITY='2'
                             --		AND csb.USER_ID='1948586504800468993'
+                            <if test="courseId !=null and courseId != ''">
+                                and ci.COURSE_ID=#{courseId}
+                            </if>
                         )t1
-                        LEFT JOIN (SELECT csb1.USER_ID,csb1.HOUR_ID FROM COURSE_STUDENT_BURIALPOINT csb1 WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1' GROUP BY csb1.USER_ID,csb1.HOUR_ID) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
+                        LEFT JOIN (
+                            SELECT csb1.USER_ID,csb1.HOUR_ID
+                            FROM COURSE_STUDENT_BURIALPOINT csb1
+                            WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1'
+                            <if test="startTime!=null and startTime != ''">
+                                and csb1.CREATE_TIME &gt;=#{startTime}
+                            </if>
+                            <if test="endTime!=null and endTime != ''">
+                                and csb1.CREATE_TIME &lt;=#{endTime}
+                            </if>
+                            GROUP BY csb1.USER_ID,csb1.HOUR_ID
+                        ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
                         WHERE 1=1
                         --	AND t1.courseId='1954728193252552705'
                         GROUP BY t1.userId
@@ -207,30 +255,44 @@
     </select>
     <select id="getAllDownloadCount" resultType="java.lang.String">
         SELECT
---			t1.hourId AS hourId,
---			t1.chapterId AS chapterId,
---			csb.USER_ID AS userId
-            IFNULL(COUNT(csb.HOUR_ID AS hourId),0) as allDownloadCount
+        --			t1.hourId AS hourId,
+        --			t1.chapterId AS chapterId,
+        --			csb.USER_ID AS userId
+        IFNULL(COUNT(csb.HOUR_ID AS hourId),0) as allDownloadCount
         FROM (
-                 SELECT
-                     cop.ID AS copId,
-                     stu.ID AS userId,
-                     cch.ID AS hourId,
-                     cc.ID AS chapterId,
-                     ci.COURSE_ID AS courseId
-                 FROM COURSE_INFO ci
-                          LEFT JOIN COURSE_OPEN cop ON ci.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
-                          LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'
-                          LEFT JOIN COURSE_CHAPTER cc ON ci.COURSE_ID =cc.COURSE_ID AND cc.DELETE_FLAG ='NOT_DELETE'
-                          LEFT JOIN COURSE_CLASSHOUR cch ON cc.ID=cch.CHAPTER_ID AND cch.DELETE_FLAG ='NOT_DELETE'
-                 WHERE ci.DELETE_FLAG ='NOT_DELETE'
-                   AND cch.ID IS NOT NULL
-                   AND cc.ID IS NOT NULL
-                   AND ci.COURSE_ID IS NOT NULL
-                   AND stu.ID IS NOT NULL
+            SELECT
+                cop.ID AS copId,
+                stu.ID AS userId,
+                cch.ID AS hourId,
+                cc.ID AS chapterId,
+            ci.COURSE_ID AS courseId
+            FROM COURSE_INFO ci
+            LEFT JOIN COURSE_OPEN cop ON ci.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
+            LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'
+            LEFT JOIN COURSE_CHAPTER cc ON ci.COURSE_ID =cc.COURSE_ID AND cc.DELETE_FLAG ='NOT_DELETE'
+            LEFT JOIN COURSE_CLASSHOUR cch ON cc.ID=cch.CHAPTER_ID AND cch.DELETE_FLAG ='NOT_DELETE'
+            WHERE ci.DELETE_FLAG ='NOT_DELETE'
+            AND cch.ID IS NOT NULL
+            AND cc.ID IS NOT NULL
+            AND ci.COURSE_ID IS NOT NULL
+            AND stu.ID IS NOT NULL
 --		AND csb.USER_ID='1948586504800468993'
-             )t1
-        JOIN (SELECT csb1.USER_ID,csb1.HOUR_ID FROM COURSE_STUDENT_BURIALPOINT csb1 WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='2' AND csb1.TYPE='2') csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
+            <if test="courseId !=null and courseId != ''">
+                and ci.COURSE_ID=#{courseId}
+            </if>
+        )t1
+        JOIN (
+            SELECT csb1.USER_ID,csb1.HOUR_ID
+            FROM COURSE_STUDENT_BURIALPOINT csb1
+            WHERE csb1.DELETE_FLAG ='NOT_DELETE'
+            AND csb1.FUNC_TYPE='2' AND csb1.TYPE='2'
+            <if test="startTime!=null and startTime != ''">
+                and csb1.CREATE_TIME &gt;=#{startTime}
+            </if>
+            <if test="endTime!=null and endTime != ''">
+                and csb1.CREATE_TIME &lt;=#{endTime}
+            </if>
+        ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
         WHERE 1=1
     </select>
     <select id="getDownloadRate" resultType="java.lang.String">
@@ -261,6 +323,9 @@
                         AND cc.ID IS NOT NULL
                         AND ci.COURSE_ID IS NOT NULL
                         AND stu.ID IS NOT NULL
+                        <if test="courseId !=null and courseId != ''">
+                            and ci.COURSE_ID=#{courseId}
+                        </if>
                     )t2
                     WHERE 1=1
                     --	AND t2.courseId='1954728193252552705'
@@ -289,8 +354,22 @@
                         AND ci.COURSE_ID IS NOT NULL
                         AND stu.ID IS NOT NULL
                         --		AND csb.USER_ID='1948586504800468993'
+                        <if test="courseId !=null and courseId != ''">
+                            and ci.COURSE_ID=#{courseId}
+                        </if>
                     )t1
-                    JOIN (SELECT csb1.USER_ID,csb1.HOUR_ID FROM COURSE_STUDENT_BURIALPOINT csb1 WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='2' AND csb1.TYPE='2' GROUP BY csb1.USER_ID,csb1.HOUR_ID) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
+                    JOIN (
+                        SELECT csb1.USER_ID,csb1.HOUR_ID
+                        FROM COURSE_STUDENT_BURIALPOINT csb1
+                        WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='2' AND csb1.TYPE='2'
+                        <if test="startTime!=null and startTime != ''">
+                            and csb1.CREATE_TIME &gt;=#{startTime}
+                        </if>
+                        <if test="endTime!=null and endTime != ''">
+                            and csb1.CREATE_TIME &lt;=#{endTime}
+                        </if>
+                        GROUP BY csb1.USER_ID,csb1.HOUR_ID
+                    ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
                     WHERE 1=1
                     --	AND t1.courseId='1954728193252552705'
                 )AS downLoadCount
@@ -302,11 +381,11 @@
             IFNULL(ROUND(AVG(z1.downloadCount), 2),0) avgDownloadCount
         FROM (
             SELECT
-            --	t1.hourId AS hourId,
-            --	t1.chapterId AS chapterId,
-            --	t1.userId AS userId
-            t1.userId AS userId,
-            COUNT(t1.hourId) AS downloadCount
+                --	t1.hourId AS hourId,
+                --	t1.chapterId AS chapterId,
+                --	t1.userId AS userId
+                t1.userId AS userId,
+                COUNT(t1.hourId) AS downloadCount
             FROM (
                 SELECT
                     cop.ID AS copId,
@@ -325,8 +404,22 @@
                 AND ci.COURSE_ID IS NOT NULL
                 AND stu.ID IS NOT NULL
                 --		AND csb.USER_ID='1948586504800468993'
+                <if test="courseId !=null and courseId != ''">
+                    and ci.COURSE_ID=#{courseId}
+                </if>
             )t1
-            JOIN (SELECT csb1.USER_ID,csb1.HOUR_ID FROM COURSE_STUDENT_BURIALPOINT csb1 WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='2' AND csb1.TYPE='2') csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
+            JOIN (
+                SELECT csb1.USER_ID,csb1.HOUR_ID
+                FROM COURSE_STUDENT_BURIALPOINT csb1
+                WHERE csb1.DELETE_FLAG ='NOT_DELETE'
+                AND csb1.FUNC_TYPE='2' AND csb1.TYPE='2'
+                <if test="startTime!=null and startTime != ''">
+                    and csb1.CREATE_TIME &gt;=#{startTime}
+                </if>
+                <if test="endTime!=null and endTime != ''">
+                    and csb1.CREATE_TIME &lt;=#{endTime}
+                </if>
+            ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
             WHERE 1=1
             GROUP BY t1.userId
         )z1
@@ -341,11 +434,11 @@
             IFNULL(count(csb.ID),0) AS jumpOutCount
         FROM (
             SELECT
-            cop.ID AS copId,
-            stu.ID AS userId,
-            cch.ID AS hourId,
-            cc.ID AS chapterId,
-            ci.COURSE_ID AS courseId
+                cop.ID AS copId,
+                stu.ID AS userId,
+                cch.ID AS hourId,
+                cc.ID AS chapterId,
+                ci.COURSE_ID AS courseId
             FROM COURSE_INFO ci
             LEFT JOIN COURSE_OPEN cop ON ci.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
             LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'
@@ -357,8 +450,22 @@
             AND ci.COURSE_ID IS NOT NULL
             AND stu.ID IS NOT NULL
             --		AND csb.USER_ID='1948586504800468993'
+            <if test="courseId !=null and courseId != ''">
+                and ci.COURSE_ID=#{courseId}
+            </if>
         )t1
-        JOIN (SELECT csb1.ID,csb1.USER_ID,csb1.HOUR_ID,csb1.PROGRESS FROM COURSE_STUDENT_BURIALPOINT csb1 WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1' AND csb1.PROGRESS &lt; 100) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
+        JOIN (
+            SELECT csb1.ID,csb1.USER_ID,csb1.HOUR_ID,csb1.PROGRESS
+            FROM COURSE_STUDENT_BURIALPOINT csb1
+            WHERE csb1.DELETE_FLAG ='NOT_DELETE'
+            <if test="startTime!=null and startTime != ''">
+                and csb1.CREATE_TIME &gt;=#{startTime}
+            </if>
+            <if test="endTime!=null and endTime != ''">
+                and csb1.CREATE_TIME &lt;=#{endTime}
+            </if>
+            AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1' AND csb1.PROGRESS &lt; 100
+        ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
         WHERE 1=1
     </select>
     <select id="getJumpOutRate" resultType="java.lang.String">
@@ -379,11 +486,11 @@
                 count(csb.ID) AS allCount
             FROM (
                 SELECT
-                cop.ID AS copId,
-                stu.ID AS userId,
-                cch.ID AS hourId,
-                cc.ID AS chapterId,
-                ci.COURSE_ID AS courseId
+                    cop.ID AS copId,
+                    stu.ID AS userId,
+                    cch.ID AS hourId,
+                    cc.ID AS chapterId,
+                    ci.COURSE_ID AS courseId
                 FROM COURSE_INFO ci
                 LEFT JOIN COURSE_OPEN cop ON ci.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
                 LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'
@@ -395,8 +502,21 @@
                 AND ci.COURSE_ID IS NOT NULL
                 AND stu.ID IS NOT NULL
                 --		AND csb.USER_ID='1948586504800468993'
+                <if test="courseId !=null and courseId != ''">
+                    and ci.COURSE_ID=#{courseId}
+                </if>
             )t1
-            JOIN (SELECT csb1.ID,csb1.USER_ID,csb1.HOUR_ID,csb1.PROGRESS FROM COURSE_STUDENT_BURIALPOINT csb1 WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1') csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
+            JOIN (
+                SELECT csb1.ID,csb1.USER_ID,csb1.HOUR_ID,csb1.PROGRESS
+                FROM COURSE_STUDENT_BURIALPOINT csb1
+                WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1'
+                <if test="startTime!=null and startTime != ''">
+                    and csb1.CREATE_TIME &gt;=#{startTime}
+                </if>
+                <if test="endTime!=null and endTime != ''">
+                    and csb1.CREATE_TIME &lt;=#{endTime}
+                </if>
+            ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
             WHERE 1=1
         )z1
     </select>
@@ -413,11 +533,11 @@
             ROUND(AVG(IFNULL(csb.END_TIME,0)), 2) AS jumpAvgTime
         FROM (
             SELECT
-            cop.ID AS copId,
-            stu.ID AS userId,
-            cch.ID AS hourId,
-            cc.ID AS chapterId,
-            ci.COURSE_ID AS courseId
+                cop.ID AS copId,
+                stu.ID AS userId,
+                cch.ID AS hourId,
+                cc.ID AS chapterId,
+                ci.COURSE_ID AS courseId
             FROM COURSE_INFO ci
             LEFT JOIN COURSE_OPEN cop ON ci.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
             LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'
@@ -429,8 +549,21 @@
             AND ci.COURSE_ID IS NOT NULL
             AND stu.ID IS NOT NULL
             --		AND csb.USER_ID='1948586504800468993'
+            <if test="courseId !=null and courseId != ''">
+                and ci.COURSE_ID=#{courseId}
+            </if>
         )t1
-        JOIN (SELECT csb1.ID,csb1.USER_ID,csb1.HOUR_ID,csb1.END_TIME FROM COURSE_STUDENT_BURIALPOINT csb1 WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1' AND csb1.PROGRESS &lt; 100) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
+        JOIN (
+            SELECT csb1.ID,csb1.USER_ID,csb1.HOUR_ID,csb1.END_TIME
+            FROM COURSE_STUDENT_BURIALPOINT csb1
+            WHERE csb1.DELETE_FLAG ='NOT_DELETE' AND csb1.FUNC_TYPE='1' AND csb1.TYPE='1' AND csb1.PROGRESS &lt; 100
+            <if test="startTime!=null and startTime != ''">
+                and csb1.CREATE_TIME &gt;=#{startTime}
+            </if>
+            <if test="endTime!=null and endTime != ''">
+                and csb1.CREATE_TIME &lt;=#{endTime}
+            </if>
+        ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
         WHERE 1=1
     </select>
     <select id="getNoteCount" resultType="java.lang.String">
@@ -443,9 +576,9 @@
             count(cr.ID) noteCount
         from(
             SELECT
-            cch.ID AS hourId,
-            cc.ID AS chapterId,
-            ci.COURSE_ID AS courseId
+                cch.ID AS hourId,
+                cc.ID AS chapterId,
+                ci.COURSE_ID AS courseId
             FROM COURSE_INFO ci
             LEFT JOIN COURSE_OPEN cop ON ci.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
             LEFT JOIN COURSE_CHAPTER cc ON ci.COURSE_ID =cc.COURSE_ID AND cc.DELETE_FLAG ='NOT_DELETE'
@@ -454,9 +587,20 @@
             AND cch.ID IS NOT NULL
             AND cc.ID IS NOT NULL
             AND ci.COURSE_ID IS NOT NULL
+            <if test="courseId !=null and courseId != ''">
+                and ci.COURSE_ID=#{courseId}
+            </if>
             GROUP BY cch.ID,cc.ID,ci.COURSE_ID
         )t1
-        JOIN COURSE_RELATE cr ON t1.hourId=cr.MAIN_ID AND cr.DELETE_FLAG ='NOT_DELETE' and cr.CHAPTERHOUR_TYPE ='1' AND cr.INFO_TYPE ='1' AND FUNC_TYPE ='6'
+        JOIN (
+            select cr1.* from COURSE_RELATE cr1
+            <if test="startTime!=null and startTime != ''">
+                and cr1.CREATE_TIME &gt;=#{startTime}
+            </if>
+            <if test="endTime!=null and endTime != ''">
+                and cr1.CREATE_TIME &lt;=#{endTime}
+            </if>
+        ) cr ON t1.hourId=cr.MAIN_ID AND cr.DELETE_FLAG ='NOT_DELETE' and cr.CHAPTERHOUR_TYPE ='1' AND cr.INFO_TYPE ='1' AND FUNC_TYPE ='6'
     </select>
     <select id="getPostCount" resultType="java.lang.String">
         SELECT
@@ -478,6 +622,9 @@
             AND cc.ID IS NOT NULL
             AND ci.COURSE_ID IS NOT NULL
             AND stu.ID IS NOT NULL
+            <if test="courseId !=null and courseId != ''">
+                and ci.COURSE_ID=#{courseId}
+            </if>
             GROUP BY stu.ID,cc.ID,ci.COURSE_ID
         )t1
         JOIN (
@@ -494,6 +641,12 @@
             --AND reply.CREATE_TIME &lt; TRUNC(SYSDATE) + 1
             --AND chapter.COURSE_ID = '1946462050075185153'
             --AND reply.USER_ID = '1948586504800468993'
+            <if test="startTime!=null and startTime != ''">
+                and reply.CREATE_TIME &gt;=#{startTime}
+            </if>
+            <if test="endTime!=null and endTime != ''">
+                and reply.CREATE_TIME &lt;=#{endTime}
+            </if>
         )t2 ON t1.chapterId=t2.chapterId AND t1.userId=t2.userId
         WHERE 1=1
     </select>
@@ -506,9 +659,9 @@
             IFNULL(count(t2.replyId),0) postCount
         from(
             SELECT
-            stu.ID AS userId,
-            cc.ID AS chapterId,
-            ci.COURSE_ID AS courseId
+                stu.ID AS userId,
+                cc.ID AS chapterId,
+                ci.COURSE_ID AS courseId
             FROM COURSE_INFO ci
             LEFT JOIN COURSE_OPEN cop ON ci.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
             LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'
@@ -517,6 +670,9 @@
             AND cc.ID IS NOT NULL
             AND ci.COURSE_ID IS NOT NULL
             AND stu.ID IS NOT NULL
+            <if test="courseId !=null and courseId != ''">
+                and ci.COURSE_ID=#{courseId}
+            </if>
             GROUP BY stu.ID,cc.ID,ci.COURSE_ID
         )t1
         JOIN (
@@ -534,6 +690,12 @@
             --AND reply.CREATE_TIME &lt; TRUNC(SYSDATE) + 1
             --AND chapter.COURSE_ID = '1946462050075185153'
             --AND reply.USER_ID = '1948586504800468993'
+            <if test="startTime!=null and startTime != ''">
+                and reply.CREATE_TIME &gt;=#{startTime}
+            </if>
+            <if test="endTime!=null and endTime != ''">
+                and reply.CREATE_TIME &lt;=#{endTime}
+            </if>
         )t2 ON t1.chapterId=t2.chapterId AND t1.userId=t2.userId
         WHERE 1=1
     </select>
@@ -576,10 +738,10 @@
                 FROM(
                     --  #这里需要分组，将不同开课下相同课程和课时归一，避免不同开课相同课程数据重复
                     SELECT
-                    stu.ID AS userId,
-                    cch.ID AS hourId,
-                    cc.ID AS chapterId,
-                    ci.COURSE_ID AS courseId
+                        stu.ID AS userId,
+                        cch.ID AS hourId,
+                        cc.ID AS chapterId,
+                        ci.COURSE_ID AS courseId
                     FROM COURSE_INFO ci
                     LEFT JOIN COURSE_OPEN cop ON ci.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
                     LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'
@@ -596,6 +758,9 @@
                             #{item}
                         </foreach>
                     </if>
+                    <if test="courseId !=null and courseId != ''">
+                        and ci.COURSE_ID=#{courseId}
+                    </if>
                     GROUP BY stu.ID,cch.ID,cc.ID,ci.COURSE_ID
                 )t1
                 LEFT JOIN (
@@ -607,6 +772,12 @@
                             #{item}
                         </foreach>
                     </if>
+                    <if test="startTime!=null and startTime != ''">
+                        and csb1.CREATE_TIME &gt;=#{startTime}
+                    </if>
+                    <if test="endTime!=null and endTime != ''">
+                        and csb1.CREATE_TIME &lt;=#{endTime}
+                    </if>
                 ) csbVideo ON csbVideo.HOUR_ID =t1.hourId AND csbVideo.USER_ID=t1.userId
                 WHERE 1=1
                 GROUP BY t1.userId
@@ -615,18 +786,18 @@
     </select>
     <select id="getQuickOperaCountListStudyBehavior" resultType="java.util.Map">
         SELECT
-        su.ID AS userId,
-        IFNULL(finalTwo.quickOperaCount,0) AS quickOperaCount
+            su.ID AS userId,
+            IFNULL(finalTwo.quickOperaCount,0) AS quickOperaCount
         FROM (
-        SELECT su1.* FROM SYS_USER su1
-        WHERE su1.DELETE_FLAG='NOT_DELETE'
-        AND su1.EDU_IDENTITY='2'
-        <if test="userIdList !=null and userIdList.size()>0">
-            and su1.ID in
-            <foreach collection=" userIdList" close=")" index="index" item="item" open="(" separator=",">
-                #{item}
-            </foreach>
-        </if>
+            SELECT su1.* FROM SYS_USER su1
+            WHERE su1.DELETE_FLAG='NOT_DELETE'
+            AND su1.EDU_IDENTITY='2'
+            <if test="userIdList !=null and userIdList.size()>0">
+                and su1.ID in
+                <foreach collection=" userIdList" close=")" index="index" item="item" open="(" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         ) su
         LEFT JOIN(
         SELECT
@@ -656,6 +827,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="courseId !=null and courseId != ''">
+                and ci.COURSE_ID=#{courseId}
+            </if>
             GROUP BY stu.ID,cch.ID,cc.ID,ci.COURSE_ID
         )t1
         LEFT JOIN (
@@ -667,6 +841,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="startTime!=null and startTime != ''">
+                and csb1.CREATE_TIME &gt;=#{startTime}
+            </if>
+            <if test="endTime!=null and endTime != ''">
+                and csb1.CREATE_TIME &lt;=#{endTime}
+            </if>
         ) csbQuickOpera ON csbQuickOpera.HOUR_ID =t1.hourId AND csbQuickOpera.USER_ID=t1.userId
         WHERE 1=1
         GROUP BY t1.userId
@@ -722,6 +902,9 @@
                             #{item}
                         </foreach>
                     </if>
+                    <if test="courseId !=null and courseId != ''">
+                        and ci.COURSE_ID=#{courseId}
+                    </if>
                 )t2
                 WHERE 1=1
                 --	AND t2.courseId='1954728193252552705'
@@ -758,6 +941,9 @@
                         </foreach>
                     </if>
                     --		AND csb.USER_ID='1948586504800468993'
+                    <if test="courseId !=null and courseId != ''">
+                        and ci.COURSE_ID=#{courseId}
+                    </if>
                 )t1
                 LEFT JOIN (
                     SELECT csb1.USER_ID,csb1.HOUR_ID FROM COURSE_STUDENT_BURIALPOINT csb1
@@ -768,6 +954,12 @@
                             #{item}
                         </foreach>
                     </if>
+                    <if test="startTime!=null and startTime != ''">
+                        and csb1.CREATE_TIME &gt;=#{startTime}
+                    </if>
+                    <if test="endTime!=null and endTime != ''">
+                        and csb1.CREATE_TIME &lt;=#{endTime}
+                    </if>
                     GROUP BY csb1.USER_ID,csb1.HOUR_ID
                 ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
                 WHERE 1=1
@@ -817,9 +1009,20 @@
                         #{item}
                     </foreach>
                 </if>
+                <if test="courseId !=null and courseId != ''">
+                    and ci.COURSE_ID=#{courseId}
+                </if>
                 GROUP BY stu.ID,cch.ID,cc.ID,ci.COURSE_ID
             )t1
-            JOIN COURSE_RELATE cr ON t1.hourId=cr.MAIN_ID AND cr.DELETE_FLAG ='NOT_DELETE' and cr.CHAPTERHOUR_TYPE ='1' AND cr.INFO_TYPE ='1' AND FUNC_TYPE ='6'
+            JOIN (
+                select cr1.* COURSE_RELATE cr1
+                <if test="startTime!=null and startTime != ''">
+                    and cr1.CREATE_TIME &gt;=#{startTime}
+                </if>
+                <if test="endTime!=null and endTime != ''">
+                    and cr1.CREATE_TIME &lt;=#{endTime}
+                </if>
+            ) cr ON t1.hourId=cr.MAIN_ID AND cr.DELETE_FLAG ='NOT_DELETE' and cr.CHAPTERHOUR_TYPE ='1' AND cr.INFO_TYPE ='1' AND FUNC_TYPE ='6'
             WHERE 1=1
             GROUP BY t1.userId
         )finalFour ON su.ID =finalFour.userId
@@ -882,6 +1085,9 @@
                             #{item}
                         </foreach>
                     </if>
+                    <if test="courseId !=null and courseId != ''">
+                        and ci.COURSE_ID=#{courseId}
+                    </if>
                     --		AND csb.USER_ID='1948586504800468993'
                     GROUP BY stu.ID,cch.ID,cc.ID,ci.COURSE_ID
                 )t1
@@ -902,6 +1108,12 @@
                             #{item}
                         </foreach>
                     </if>
+                    <if test="startTime!=null and startTime != ''">
+                        and csb1.CREATE_TIME &gt;=#{startTime}
+                    </if>
+                    <if test="endTime!=null and endTime != ''">
+                        and csb1.CREATE_TIME &lt;=#{endTime}
+                    </if>
                 ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
                 WHERE 1=1
                 GROUP BY csb.jumpTime,csb.USER_ID
@@ -940,6 +1152,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="startTime!=null and startTime != ''">
+                and reply.CREATE_TIME &gt;=#{startTime}
+            </if>
+            <if test="endTime!=null and endTime != ''">
+                and reply.CREATE_TIME &lt;=#{endTime}
+            </if>
             GROUP BY reply.USER_ID
         )finalSix ON su.ID =finalSix.userId
     </select>
@@ -973,6 +1191,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="startTime!=null and startTime != ''">
+                and reply.CREATE_TIME &gt;=#{startTime}
+            </if>
+            <if test="endTime!=null and endTime != ''">
+                and reply.CREATE_TIME &lt;=#{endTime}
+            </if>
             GROUP BY reply.USER_ID
         )finalSeven ON su.ID =finalSeven.userId
     </select>
@@ -1005,12 +1229,16 @@
                 AND cch1.ID IS NOT NULL
                 AND cc1.ID IS NOT NULL
                 AND ci1.COURSE_ID IS NOT NULL
+                <if test="courseId !=null and courseId != ''">
+                    and ci1.COURSE_ID=#{courseId}
+                </if>
                 GROUP BY cch1.ID,cc1.ID,ci1.COURSE_ID
             )basis
             JOIN COURSE_INFO ci ON ci.COURSE_ID =basis.courseId
             JOIN COURSE_CHAPTER cc ON cc.ID = basis.chapterId
             JOIN COURSE_CLASSHOUR cch ON cch.ID = basis.hourId
         )classhour
+        where 1=1
     </select>
     <select id="getAllStayTimeListVideoDetail" resultType="java.util.Map">
         SELECT