1.学习行为分析相关统计部分接口完善sql语句，加入学院维度检索

2.一键复制课程完善
3.新建课时用的下拉资源列表修复bug，加入mp4格式

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

@@ -366,7 +366,20 @@ public class CourseInfoController {
         //1.添加课程信息
         CourseInfo newCourseInfo=new CourseInfo();
         BeanUtil.copyProperties(courseInfo, newCourseInfo);
-        newCourseInfo.setCourseName(courseInfo.getCourseName()+"-复制-"+ DateUtil.format(new Date(), "yyyy-MM-dd"));
+        String courseName=courseInfo.getCourseName();
+        // 找到最后一个 "||复制" 的位置
+        int lastIndex = courseName.lastIndexOf("||复制");
+
+        // 如果存在复制约定字符
+        if (lastIndex != -1) {
+            // 说明之前存在复制，从最后一个"||复制"开始截取，保留复制部分内容前面的信息
+            courseName = courseName.substring(0, lastIndex);
+            courseName=courseName+"||复制-"+ DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+        } else {
+            // 如果没有找到 "||复制"，说明是第一次复制，直接拼上日期时间
+            courseName=courseName+"||复制-"+ DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+        }
+        newCourseInfo.setCourseName(courseName);
         newCourseInfo.setCourseId(null);
         newCourseInfo.setPutawayStatus("0");
         newCourseInfo.setCreateTime(null);

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

@@ -125,7 +125,7 @@ public class ResourceRecordController {
         String isVedio="0";
         if(StringUtils.isNotEmpty(req.getParameter("isVedio")))isVedio=req.getParameter("isVedio");
         if("1".equals(isVedio)){
-            String extendName="wmv,avi,flv,mpeg,mpg,rmvb,mov,mkv";
+            String extendName="wmv,avi,flv,mpeg,mpg,rmvb,mov,mkv,mp4";
             extendNameList = Arrays.asList(extendName.split(","));
             param.put("extendNameList", extendNameList);
         }

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

@@ -3,16 +3,27 @@
 <mapper namespace="vip.xiaonuo.disk.mapper.StudyBehaviorProgressMapper">
 
     <select id="getAllCourseCount" resultType="java.lang.String">
-        SELECT
-            COUNT(ci.COURSE_ID) AS allCourseCount
-        FROM COURSE_INFO ci
-        WHERE ci.DELETE_FLAG ='NOT_DELETE'
-        <if test="startTime!=null and startTime != ''">
-            and ci.CREATE_TIME &gt;=#{startTime}
-        </if>
-        <if test="endTime!=null and endTime != ''">
-            and ci.CREATE_TIME &lt;=#{endTime}
-        </if>
+        SELECT COUNT(t1.COURSE_ID) AS allCourseCount
+        FROM(
+            SELECT
+                ci.COURSE_ID
+            FROM SYS_ORG so
+            LEFT JOIN "grades" gr  ON gr.college_id=so.ID AND gr.DELETE_FLAG='NOT_DELETE'
+            LEFT JOIN COURSE_OPEN cop ON cop.GRADES_ID =gr.grades_id AND cop.DELETE_FLAG='NOT_DELETE'
+            LEFT JOIN COURSE_INFO ci ON cop.COURSE_ID =ci.COURSE_ID
+            WHERE ci.DELETE_FLAG ='NOT_DELETE'
+            <if test="startTime!=null and startTime != ''">
+                and ci.CREATE_TIME &gt;=#{startTime}
+            </if>
+            <if test="endTime!=null and endTime != ''">
+                and ci.CREATE_TIME &lt;=#{endTime}
+            </if>
+            <if test="orgId !=null and orgId != ''">
+                and so.ID=#{orgId}
+            </if>
+            GROUP BY ci.COURSE_ID
+        )t1
+
     </select>
     <select id="getActiveCourseCount" resultType="java.lang.String">
         SELECT
@@ -26,22 +37,36 @@
                 t1.courseId AS courseId
             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'
+                    z1.courseId AS courseId
+                FROM (
+                    --	#查出每个院系对应每个班级以及对应课程，因为一个院系，可能会有多个班级，多个班级对应的多个开课，可能就会导致某个课程对于一个院系重复，所以需要提前分组
+                    SELECT
+                        so.ID AS orgId,
+                        gr.grades_id AS gradesId,
+                        ci.COURSE_ID AS courseId
+                    FROM SYS_ORG so
+                    LEFT JOIN "grades" gr  ON gr.college_id=so.ID AND gr.DELETE_FLAG='NOT_DELETE'
+                    LEFT JOIN COURSE_OPEN cop ON cop.GRADES_ID =gr.grades_id AND cop.DELETE_FLAG='NOT_DELETE'
+                    LEFT JOIN COURSE_INFO ci ON cop.COURSE_ID =ci.COURSE_ID
+                    WHERE so.DELETE_FLAG='NOT_DELETE'
+                    AND gr.grades_id IS NOT NULL
+                    AND ci.COURSE_ID IS NOT NULL
+                    <if test="orgId !=null and orgId != ''">
+                        and so.ID=#{orgId}
+                    </if>
+                    GROUP BY so.ID,ci.COURSE_ID,gr.grades_id
+                )z1
+                LEFT JOIN SYS_USER stu ON stu.GRADES_ID =z1.gradesId AND stu.DELETE_FLAG='NOT_DELETE'
+                LEFT JOIN COURSE_CHAPTER cc ON z1.courseId =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'
+                WHERE 1=1
                 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'
+                GROUP BY stu.ID,cch.ID,cc.ID,z1.courseId
             )t1
             JOIN (
                 SELECT
@@ -90,22 +115,36 @@
                             t1.courseId AS courseId
                         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'
+                                z1.courseId AS courseId
+                            FROM (
+                                --	#查出每个院系对应每个班级以及对应课程，因为一个院系，可能会有多个班级，多个班级对应的多个开课，可能就会导致某个课程对于一个院系重复，所以需要提前分组
+                                SELECT
+                                    so.ID AS orgId,
+                                    gr.grades_id AS gradesId,
+                                    ci.COURSE_ID AS courseId
+                                FROM SYS_ORG so
+                                LEFT JOIN "grades" gr  ON gr.college_id=so.ID AND gr.DELETE_FLAG='NOT_DELETE'
+                                LEFT JOIN COURSE_OPEN cop ON cop.GRADES_ID =gr.grades_id AND cop.DELETE_FLAG='NOT_DELETE'
+                                LEFT JOIN COURSE_INFO ci ON cop.COURSE_ID =ci.COURSE_ID
+                                WHERE so.DELETE_FLAG='NOT_DELETE'
+                                AND gr.grades_id IS NOT NULL
+                                AND ci.COURSE_ID IS NOT NULL
+                                <if test="orgId !=null and orgId != ''">
+                                    and so.ID=#{orgId}
+                                </if>
+                                GROUP BY so.ID,ci.COURSE_ID,gr.grades_id
+                            )z1
+                            LEFT JOIN SYS_USER stu ON stu.GRADES_ID =z1.gradesId AND stu.DELETE_FLAG='NOT_DELETE'
+                            LEFT JOIN COURSE_CHAPTER cc ON z1.courseId =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'
+                            WHERE 1=1
                             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'
+                            GROUP BY stu.ID,cch.ID,cc.ID,z1.courseId
                         )t1
                         JOIN (
                             SELECT
@@ -149,7 +188,11 @@
         SELECT
             ifnull(COUNT(su.ID),0) AS userCount
         FROM SYS_USER su
+        LEFT JOIN "grades" gr  ON gr."grades_id" =su.GRADES_ID AND gr.DELETE_FLAG='NOT_DELETE'
         WHERE su.DELETE_FLAG ='NOT_DELETE'
+        <if test="orgId !=null and orgId != ''">
+            and gr.COLLEGE_ID=#{orgId}
+        </if>
         <if test="startTime!=null and startTime != ''">
             and su.CREATE_TIME &gt;=#{startTime}
         </if>
@@ -190,22 +233,36 @@
                 IFNULL(SUM(csb.STAY_TIME),0) AS userAllStayTIme
             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'
+                    z1.courseId AS courseId
+                FROM (
+                    --	#查出每个院系对应每个班级以及对应课程，因为一个院系，可能会有多个班级，多个班级对应的多个开课，可能就会导致某个课程对于一个院系重复，所以需要提前分组
+                    SELECT
+                        so.ID AS orgId,
+                        gr.grades_id AS gradesId,
+                        ci.COURSE_ID AS courseId
+                    FROM SYS_ORG so
+                    LEFT JOIN "grades" gr  ON gr.college_id=so.ID AND gr.DELETE_FLAG='NOT_DELETE'
+                    LEFT JOIN COURSE_OPEN cop ON cop.GRADES_ID =gr.grades_id AND cop.DELETE_FLAG='NOT_DELETE'
+                    LEFT JOIN COURSE_INFO ci ON cop.COURSE_ID =ci.COURSE_ID
+                    WHERE so.DELETE_FLAG='NOT_DELETE'
+                    AND gr.grades_id IS NOT NULL
+                    AND ci.COURSE_ID IS NOT NULL
+                    <if test="orgId !=null and orgId != ''">
+                        and so.ID=#{orgId}
+                    </if>
+                    GROUP BY so.ID,ci.COURSE_ID,gr.grades_id
+                )z1
+                LEFT JOIN SYS_USER stu ON stu.GRADES_ID =z1.gradesId AND stu.DELETE_FLAG='NOT_DELETE'
+                LEFT JOIN COURSE_CHAPTER cc ON z1.courseId =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'
+                WHERE 1=1
                 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'
+                GROUP BY stu.ID,cch.ID,cc.ID,z1.courseId
             )t1
             LEFT JOIN (SELECT csb1.USER_ID,csb1.HOUR_ID,csb1.STAY_TIME 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
             WHERE 1=1
@@ -230,22 +287,36 @@
                     IFNULL(SUM(csb.STAY_TIME),0) AS userAllStayTIme
                 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'
+                        z1.courseId AS courseId
+                    FROM (
+                        --	#查出每个院系对应每个班级以及对应课程，因为一个院系，可能会有多个班级，多个班级对应的多个开课，可能就会导致某个课程对于一个院系重复，所以需要提前分组
+                        SELECT
+                            so.ID AS orgId,
+                            gr.grades_id AS gradesId,
+                            ci.COURSE_ID AS courseId
+                        FROM SYS_ORG so
+                        LEFT JOIN "grades" gr  ON gr.college_id=so.ID AND gr.DELETE_FLAG='NOT_DELETE'
+                        LEFT JOIN COURSE_OPEN cop ON cop.GRADES_ID =gr.grades_id AND cop.DELETE_FLAG='NOT_DELETE'
+                        LEFT JOIN COURSE_INFO ci ON cop.COURSE_ID =ci.COURSE_ID
+                        WHERE so.DELETE_FLAG='NOT_DELETE'
+                        AND gr.grades_id IS NOT NULL
+                        AND ci.COURSE_ID IS NOT NULL
+                        <if test="orgId !=null and orgId != ''">
+                            and so.ID=#{orgId}
+                        </if>
+                        GROUP BY so.ID,ci.COURSE_ID,gr.grades_id
+                    )z1
+                    LEFT JOIN SYS_USER stu ON stu.GRADES_ID =z1.gradesId AND stu.DELETE_FLAG='NOT_DELETE'
+                    LEFT JOIN COURSE_CHAPTER cc ON z1.courseId =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'
+                    WHERE 1=1
                     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'
+                    GROUP BY stu.ID,cch.ID,cc.ID,z1.courseId
                 )t1
                 LEFT JOIN (
                     SELECT csb1.USER_ID,csb1.HOUR_ID,csb1.STAY_TIME
@@ -288,18 +359,33 @@
                             stu.ID AS userId,
                             cch.ID AS hourId,
                             cc.ID AS chapterId,
+                            z1.courseId AS courseId
+                        FROM (
+                            --	#查出每个院系对应每个班级以及对应课程，因为一个院系，可能会有多个班级，多个班级对应的多个开课，可能就会导致某个课程对于一个院系重复，所以需要提前分组
+                            SELECT
+                            so.ID AS orgId,
+                            gr.grades_id AS gradesId,
                             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'
+                            FROM SYS_ORG so
+                            LEFT JOIN "grades" gr  ON gr.college_id=so.ID AND gr.DELETE_FLAG='NOT_DELETE'
+                            LEFT JOIN COURSE_OPEN cop ON cop.GRADES_ID =gr.grades_id AND cop.DELETE_FLAG='NOT_DELETE'
+                            LEFT JOIN COURSE_INFO ci ON cop.COURSE_ID =ci.COURSE_ID
+                            WHERE so.DELETE_FLAG='NOT_DELETE'
+                            AND gr.grades_id IS NOT NULL
+                            AND ci.COURSE_ID IS NOT NULL
+                            <if test="orgId !=null and orgId != ''">
+                                and so.ID=#{orgId}
+                            </if>
+                            GROUP BY so.ID,ci.COURSE_ID,gr.grades_id
+                        )z1
+                        LEFT JOIN SYS_USER stu ON stu.GRADES_ID =z1.gradesId AND stu.DELETE_FLAG='NOT_DELETE'
+                        LEFT JOIN COURSE_CHAPTER cc ON z1.courseId =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'
+                        WHERE 1=1
                         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'
+                        GROUP BY stu.ID,cch.ID,cc.ID,z1.courseId
                     )t1
                     LEFT JOIN (
                         SELECT csb1.ID,csb1.USER_ID,csb1.HOUR_ID,csb1.CREATE_TIME
@@ -331,11 +417,11 @@
             FROM DEV_LOG dl
             WHERE dl.CATEGORY='LOGIN'
             AND dl.EXE_STATUS='SUCCESS'
-            <if test="startTime!=null and startTime != ''">
-                and dl.CREATE_TIME &gt;=#{startTime}
+            <if test="param.startTime!=null and param.startTime != ''">
+                and dl.CREATE_TIME &gt;=#{param.startTime}
             </if>
-            <if test="endTime!=null and endTime != ''">
-                and dl.CREATE_TIME &lt;=#{endTime}
+            <if test="param.endTime!=null and param.endTime != ''">
+                and dl.CREATE_TIME &lt;=#{param.endTime}
             </if>
         )t1
         GROUP by t1.createTime
@@ -370,28 +456,43 @@
                         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'
+                        z1.courseId AS courseId
+                    FROM (
+                        --	#查出每个院系对应每个班级以及对应课程，因为一个院系，可能会有多个班级，多个班级对应的多个开课，可能就会导致某个课程对于一个院系重复，所以需要提前分组
+                        SELECT
+                            so.ID AS orgId,
+                            gr.grades_id AS gradesId,
+                            ci.COURSE_ID AS courseId
+                        FROM SYS_ORG so
+                        LEFT JOIN "grades" gr  ON gr.college_id=so.ID AND gr.DELETE_FLAG='NOT_DELETE'
+                        LEFT JOIN COURSE_OPEN cop ON cop.GRADES_ID =gr.grades_id AND cop.DELETE_FLAG='NOT_DELETE'
+                        LEFT JOIN COURSE_INFO ci ON cop.COURSE_ID =ci.COURSE_ID
+                        WHERE so.DELETE_FLAG='NOT_DELETE'
+                        AND gr.grades_id IS NOT NULL
+                        AND ci.COURSE_ID IS NOT NULL
+                        <if test="orgId !=null and orgId != ''">
+                            and so.ID=#{orgId}
+                        </if>
+                        GROUP BY so.ID,ci.COURSE_ID,gr.grades_id
+                    )z1
+                    LEFT JOIN SYS_USER stu ON stu.GRADES_ID =z1.gradesId AND stu.DELETE_FLAG='NOT_DELETE'
+                    LEFT JOIN COURSE_CHAPTER cc ON z1.courseId =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'
+                    WHERE 1=1
                     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
-                    GROUP BY stu.ID,cch.ID,cc.ID,ci.COURSE_ID
+                    GROUP BY stu.ID,cch.ID,cc.ID,z1.courseId
                 )t1
                 JOIN (
                     SELECT csb1.ID,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 test="param.startTime!=null and param.startTime != ''">
+                        and csb1.CREATE_TIME &gt;=#{param.startTime}
                     </if>
-                    <if test="endTime!=null and endTime != ''">
-                        and csb1.CREATE_TIME &lt;=#{endTime}
+                    <if test="param.endTime!=null and param.endTime != ''">
+                        and csb1.CREATE_TIME &lt;=#{param.endTime}
                     </if>
                 ) csb ON csb.HOUR_ID =t1.hourId AND csb.USER_ID=t1.userId
                 WHERE 1=1
@@ -408,8 +509,8 @@
         FROM SYS_ORG so
         WHERE so.DELETE_FLAG ='NOT_DELETE'
         AND so."CATEGORY" ='COLLEGE'
-        <if test="orgId !=null and orgId != ''">
-            and so.ID=#{orgId}
+        <if test="param.orgId !=null and param.orgId != ''">
+            and so.ID=#{param.orgId}
         </if>
     </select>
     <select id="getCourseCountListCollegeCourse" resultType="java.util.Map">
@@ -868,8 +969,8 @@
         )finalThree ON su.ID =finalThree.userId
         WHERE su.DELETE_FLAG ='NOT_DELETE'
         AND su.EDU_IDENTITY ='2'
-        <if test="name !=null and name != ''">
-            and su.NAME=#{orgId}
+        <if test="param.name !=null and param.name != ''">
+            and su.NAME=#{param.name}
         </if>
     </select>
     <select id="getCourseListStudentAnalyse" resultType="java.util.Map">