1.学习进度统计完善

2.部分bug修复
3.应前端需要部分接口增加额外返参入参等

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

@@ -45,6 +45,9 @@ public class StatisticsLearningProgressController {
     public CommonResult<Map<String,Object>> topFundamentalDetail( HttpServletRequest req) {
         Map param =new HashMap();
         param.put("courseId", req.getParameter("courseId"));
+        param.put("startTime", req.getParameter("startTime"));
+        param.put("endTime", req.getParameter("endTime"));
+
         Map<String,Object> result=statisticsLearningProgressService.topFundamentalDetail(param);
         return CommonResult.data(result);
     }
@@ -61,6 +64,8 @@ public class StatisticsLearningProgressController {
     public CommonResult<Map<String,Object>> viewTendency( HttpServletRequest req) {
         Map param =new HashMap();
         param.put("courseId", req.getParameter("courseId"));
+        param.put("startTime", req.getParameter("startTime"));
+        param.put("endTime", req.getParameter("endTime"));
         Map<String,Object> result=statisticsLearningProgressService.viewTendency(param);
         return CommonResult.data(result);
     }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/Major.java

@@ -34,7 +34,7 @@ public class Major extends CommonEntity {
     /** ID */
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "ID", position = 1)
-    private Integer id;
+    private String id;
 
     /** 院系名称 */
     @ApiModelProperty(value = "院系名称", position = 2)
@@ -48,8 +48,8 @@ public class Major extends CommonEntity {
     @ApiModelProperty(value = "学院id", position = 4)
     private String collegeId;
 
-    /** 删除标志 0未删除  1已删除 */
-    @ApiModelProperty(value = "删除标志 0未删除  1已删除", position = 5)
+    /** 删除标记(NOT_DELETE-未删除) */
+    @ApiModelProperty(value = "删除标记(NOT_DELETE-未删除)", position = 12)
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
     private String deleteFlag;

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

@@ -17,7 +17,7 @@
            b.class_name,
            c.COURSE_NAME
        FROM
-           SYSDBA."COURSE_CLASSHOUR" a
+           "COURSE_CLASSHOUR" a
        LEFT JOIN class_team b ON a."class_id" = b.id
        LEFT JOIN COURSE_INFO c ON a."course_id" =c.course_id
        <where>
@@ -46,7 +46,7 @@
             b.class_name,
             c.COURSE_NAME
         FROM
-            SYSDBA."COURSE_CLASSHOUR" a
+            "COURSE_CLASSHOUR" a
         LEFT JOIN class_team b ON a."class_id" = b.id
         LEFT JOIN COURSE_INFO c ON a."course_id" =c.course_id
         where a."id"=#{id}

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

@@ -21,7 +21,7 @@
             a.COLLEGE_THREE_ID,
             d.name collegeThreeName
         FROM
-            SYSDBA."class_team" a
+            "class_team" a
         LEFT JOIN SYS_ORG b ON   a.COLLEGE_ID = b.id
         LEFT JOIN SYS_ORG c ON   a.COLLEGE_TWO_ID = c.id
         LEFT JOIN SYS_ORG d ON   a.COLLEGE_THREE_ID = d.id
@@ -53,7 +53,7 @@
             a.COLLEGE_THREE_ID,
             d.name collegeThreeName
         FROM
-            SYSDBA."class_team" a
+            "class_team" a
         LEFT JOIN SYS_ORG b ON   a.COLLEGE_ID = b.id
         LEFT JOIN SYS_ORG c ON   a.COLLEGE_TWO_ID = c.id
         LEFT JOIN SYS_ORG d ON   a.COLLEGE_THREE_ID = d.id

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

@@ -200,6 +200,7 @@
             IFNULL (t1.AUTH_TYPE,'') AS authType,
             IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='RESOURCE_RECORD_AUTH_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.AUTH_TYPE) ),'') AS authTypeName,
             IFNULL (t1.COVER_IMAGE,'') AS coverImage,
+            IFNULL (CAST(t7.AVATAR AS VARCHAR),'') AS avatar,
             IFNULL (CAST(t6.DOWNLOAD_PATH AS VARCHAR),'') AS coverImagePath
         FROM RESOURCE_RECORD t1
         LEFT JOIN RESOURCE_USERFILE t2 ON t2.USER_FILE_ID = t1.USERFILE_ID AND t2.DELETE_FLAG ='NOT_DELETE'

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

@@ -103,6 +103,7 @@
         IFNULL(ci.VIEW_COUNT ,'') as viewCount,
         IFNULL(ci.SEMESTER_ID ,'') as semesterId,
         IFNULL(s.NAME ,'') as semesterIdName,
+        IFNULL (CAST(su.AVATAR AS VARCHAR),'') AS avatar,
         IFNULL(ci.HOUR_COUNT ,'') as hourCount
         FROM COURSE_INFO ci
         LEFT JOIN DEV_FILE df ON ci.COVER_IMAGE_ID =df.ID AND df.DELETE_FLAG ='NOT_DELETE'
@@ -202,6 +203,7 @@
             IFNULL(ci.VIEW_COUNT ,'') as viewCount,
             IFNULL(ci.SEMESTER_ID ,'') as semesterId,
             IFNULL(s.NAME ,'') as semesterIdName,
+            IFNULL (CAST(su.AVATAR AS VARCHAR),'') AS avatar,
             IFNULL(ci.HOUR_COUNT ,'') as hourCount
         FROM COURSE_INFO ci
         LEFT JOIN DEV_FILE df ON ci.COVER_IMAGE_ID =df.ID AND df.DELETE_FLAG ='NOT_DELETE'

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

@@ -51,7 +51,7 @@
     <select id="queryInfo" resultType="java.util.Map">
         SELECT
             co.ID AS id,
-            IFNULL(co.TEACHER_ID ,'') AS teacherid,
+            IFNULL(co.TEACHER_ID ,'') AS teacherId,
             IFNULL(su.NAME,'') AS teacherIdName,
             IFNULL(co.GRADES_ID ,'') AS gradesId,
             IFNULL (gr.grades_name,'') AS gradesIdName,

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

@@ -23,7 +23,7 @@
                a.CREATE_USER createUser,
                a.UPDATE_TIME updateTime,
                a.UPDATE_USER updateUser
-        FROM SYSDBA."materrial_library" a
+        FROM "materrial_library" a
          LEFT JOIN SYS_ORG b ON   a.COLLEGE_ID = b.id
          LEFT JOIN SYS_ORG c ON   a.COLLEGE_TWO_ID = c.id
          LEFT JOIN SYS_ORG d ON   a.COLLEGE_THREE_ID = d.id
@@ -57,7 +57,7 @@
         a.CREATE_USER createUser,
         a.UPDATE_TIME updateTime,
         a.UPDATE_USER updateUser
-        FROM SYSDBA."materrial_library" a
+        FROM "materrial_library" a
         LEFT JOIN SYS_ORG b ON   a.COLLEGE_ID = b.id
         LEFT JOIN SYS_ORG c ON   a.COLLEGE_ID = c.id
         LEFT JOIN SYS_ORG d ON   a.COLLEGE_ID = d.id

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

@@ -27,7 +27,7 @@
            d.name resourceTypeName,
            e.name userName
        FROM
-           SYSDBA."resource_collect" a
+           "resource_collect" a
        LEFT JOIN RESOURCE_RECORD b ON  	a."resource_id" = b.id
        LEFT JOIN RESOURCE_USERFILE c ON c.USER_FILE_ID = b.USERFILE_ID
        LEFT JOIN resource_type d ON b.RESOURCE_TYPE=d.id
@@ -51,7 +51,7 @@
             a.CREATE_USER,
             a.UPDATE_USER
         FROM
-            SYSDBA."resource_collect" a
+            "resource_collect" a
         where a.DELETE_FLAG ='NOT_DELETE'
         <if test="resourceId!=null and resourceId != ''">
             and a.resource_id =#{resourceId}

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

@@ -19,6 +19,9 @@
             LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID =cop.COURSE_ID AND ci.DELETE_FLAG='NOT_DELETE'
             LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'
             WHERE cop.DELETE_FLAG ='NOT_DELETE'
+            <if test="param.courseId!=null and param.courseId != ''">
+                and ci.COURSE_ID=#{param.courseId}
+            </if>
             GROUP BY cop.COURSE_ID
         )t1 ON ci.COURSE_ID =t1.courseId
          LEFT JOIN (
@@ -27,6 +30,9 @@
             sum(ci.VIEW_COUNT) AS viewCount
             FROM COURSE_INFO ci
             WHERE ci.DELETE_FLAG ='NOT_DELETE'
+            <if test="param.courseId!=null and param.courseId != ''">
+                and ci.COURSE_ID=#{param.courseId}
+            </if>
             GROUP BY ci.COURSE_ID
         )t2 ON ci.COURSE_ID =t2.courseId
          LEFT JOIN (
@@ -36,9 +42,13 @@
             FROM COURSE_STUDENT_BURIALPOINT csb
             LEFT JOIN COURSE_CLASSHOUR cch ON cch.ID=csb.HOUR_ID AND cch.DELETE_FLAG ='NOT_DELETE'
             LEFT JOIN COURSE_CHAPTER cc ON cc.ID=cch.CHAPTER_ID AND cc.DELETE_FLAG ='NOT_DELETE'
+            LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID =cc.COURSE_ID AND ci.DELETE_FLAG ='NOT_DELETE'
             WHERE csb.DELETE_FLAG ='NOT_DELETE'
               AND csb.FUNC_TYPE='1'
               AND csb.TYPE='1'
+            <if test="param.courseId!=null and param.courseId != ''">
+                and ci.COURSE_ID=#{param.courseId}
+            </if>
             GROUP BY cc.COURSE_ID
         )t3 ON ci.COURSE_ID =t3.courseId
          LEFT JOIN (
@@ -48,11 +58,19 @@
             FROM COURSE_STUDENT_BURIALPOINT csb
             LEFT JOIN COURSE_CLASSHOUR cch ON cch.ID=csb.HOUR_ID AND cch.DELETE_FLAG ='NOT_DELETE'
             LEFT JOIN COURSE_CHAPTER cc ON cc.ID=cch.CHAPTER_ID AND cc.DELETE_FLAG ='NOT_DELETE'
+            LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID =cc.COURSE_ID AND ci.DELETE_FLAG ='NOT_DELETE'
             WHERE csb.DELETE_FLAG ='NOT_DELETE'
               AND csb.FUNC_TYPE='2'
               AND csb.TYPE='1'
+            <if test="param.courseId!=null and param.courseId != ''">
+                and ci.COURSE_ID=#{param.courseId}
+            </if>
             GROUP BY cc.COURSE_ID
         )t4 ON ci.COURSE_ID =t4.courseId
+        WHERE ci.DELETE_FLAG ='NOT_DELETE'
+        <if test="courseId!=null and courseId != ''">
+            and ci.COURSE_ID=#{courseId}
+        </if>
     </select>
 
     <select id="getCourseOpenStuNum" resultType="java.lang.String">
@@ -62,12 +80,30 @@
         LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID =cop.COURSE_ID AND ci.DELETE_FLAG='NOT_DELETE'
         LEFT JOIN SYS_USER stu ON stu.GRADES_ID =cop.GRADES_ID AND stu.DELETE_FLAG='NOT_DELETE'
         WHERE cop.DELETE_FLAG ='NOT_DELETE'
+        <if test="courseId!=null and courseId != ''">
+            and cop.COURSE_ID=#{courseId}
+        </if>
+        <if test="startTime!=null and startTime != ''">
+            and cop.CREATE_TIME &gt;=#{startTime}
+        </if>
+        <if test="endTime!=null and endTime != ''">
+            and cop.CREATE_TIME &lt;=#{endTime}
+        </if>
     </select>
     <select id="getCourseViewNum" resultType="java.lang.String">
         SELECT
             IFNULL(sum(ci.VIEW_COUNT),0) AS courseViewNum
         FROM COURSE_INFO ci
         WHERE ci.DELETE_FLAG ='NOT_DELETE'
+        <if test="courseId!=null and courseId != ''">
+            and ci.COURSE_ID=#{courseId}
+        </if>
+        <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>
     <select id="getViewTendencyNum" resultType="java.lang.String">
         SELECT
@@ -86,7 +122,7 @@
     </select>
     <select id="getPaperSubmitNum" resultType="java.lang.String">
         SELECT
-            count(tepa.id) AS paperSubmitNum
+            IFNULL(count(tepa.id),0) AS paperSubmitNum
         FROM "t_exam_paper_answer" tepa
         LEFT JOIN "t_exam_paper" tep ON tepa.exam_paper_id=tep.id AND tep.deleted='0'
         LEFT JOIN COURSE_RELATE cr ON cr.RELATE_ID=CAST(tep.id AS VARCHAR) AND cr.DELETE_FLAG ='NOT_DELETE' AND cr.CHAPTERHOUR_TYPE='1' AND cr.INFO_TYPE='0' AND (cr.FUNC_TYPE='4' OR cr.FUNC_TYPE='5')
@@ -94,10 +130,19 @@
         LEFT JOIN COURSE_CHAPTER cc ON cch.CHAPTER_ID=cc.ID AND cc.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID =cc.COURSE_ID AND ci.DELETE_FLAG ='NOT_DELETE'
         WHERE (tep.id IS NOT NULL AND cch.ID IS NOT NULL AND ci.COURSE_ID IS NOT NULL)
+        <if test="courseId!=null and courseId != ''">
+            and ci.COURSE_ID=#{courseId}
+        </if>
+        <if test="startTime!=null and startTime != ''">
+            and tepa.create_time &gt;=#{startTime}
+        </if>
+        <if test="endTime!=null and endTime != ''">
+            and tepa.create_time &lt;=#{endTime}
+        </if>
     </select>
     <select id="paperSubmeitTendency" resultType="java.lang.String">
         SELECT
-            count(tepa.id) AS paperSubmitNum
+            IFNULL(count(tepa.id),0) AS paperSubmitNum
         FROM "t_exam_paper_answer" tepa
         LEFT JOIN "t_exam_paper" tep ON tepa.exam_paper_id=tep.id AND tep.deleted='0'
         LEFT JOIN COURSE_RELATE cr ON cr.RELATE_ID=CAST(tep.id AS VARCHAR) AND cr.DELETE_FLAG ='NOT_DELETE' AND cr.CHAPTERHOUR_TYPE='1' AND cr.INFO_TYPE='0' AND (cr.FUNC_TYPE='4' OR cr.FUNC_TYPE='5')

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/MajorEditParam.java

@@ -34,7 +34,7 @@ public class MajorEditParam {
     /** ID */
     @ApiModelProperty(value = "ID", required = true, position = 1)
     @NotNull(message = "id不能为空")
-    private Integer id;
+    private String id;
 
     /** 院系名称 */
     @ApiModelProperty(value = "院系名称", position = 2)

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/MajorService.java

@@ -79,7 +79,7 @@ public interface MajorService extends IService<Major> {
      * @author pans
      * @date  2025/06/26 10:41
      **/
-    Major queryEntity(Integer id);
+    Major queryEntity(String id);
 
     List<MajorVo> select(@Valid String collegeId);
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/MajorServiceImpl.java

@@ -84,7 +84,7 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
     }
 
     @Override
-    public Major queryEntity(Integer id) {
+    public Major queryEntity(String id) {
         Major major = this.getById(id);
         if(ObjectUtil.isEmpty(major)) {
             throw new CommonException("major不存在，id值为：{}", id);

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/StatisticsLearningProgressServiceImpl.java

@@ -44,7 +44,11 @@ public class StatisticsLearningProgressServiceImpl implements StatisticsLearning
         Map result=new HashMap();
         String courseId=null;
         if(ObjectUtil.isNotEmpty(param.get("courseId")))courseId=param.get("courseId").toString();
-        List<String> months = getLastSevenMonths(param.get("month").toString());
+        String startTime="";
+        if(ObjectUtil.isNotEmpty(param.get("startTime")))startTime=param.get("startTime").toString();
+        String endTime="";
+        if(ObjectUtil.isNotEmpty(param.get("endTime")))endTime=param.get("endTime").toString();
+        List<String> months = getLastSevenMonths(startTime,endTime);
         for(String  month:months)
         {
             Map viewTendencyParam =new HashMap();
@@ -65,7 +69,11 @@ public class StatisticsLearningProgressServiceImpl implements StatisticsLearning
         Map result=new HashMap();
         String courseId=null;
         if(ObjectUtil.isNotEmpty(param.get("courseId")))courseId=param.get("courseId").toString();
-        List<String> months = getLastSevenMonths(param.get("month").toString());
+        String startTime="";
+        if(ObjectUtil.isNotEmpty(param.get("startTime")))startTime=param.get("startTime").toString();
+        String endTime="";
+        if(ObjectUtil.isNotEmpty(param.get("endTime")))endTime=param.get("endTime").toString();
+        List<String> months = getLastSevenMonths(startTime,endTime);
         for(String  month:months)
         {
             Map viewTendencyParam =new HashMap();
@@ -91,15 +99,15 @@ public class StatisticsLearningProgressServiceImpl implements StatisticsLearning
      *  获取指定七个月
      *  不传值默认查当前月
      */
-    public static List<String> getLastSevenMonths(String baseMonth) {
+    public static List<String> getLastSevenMonths(String baseStartMonth,String baseEndMonth) {
         List<String> months = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
         Calendar calendar = Calendar.getInstance();
 
         try {
             // 如果指定了基准月份，解析并设置Calendar
-            if (baseMonth != null) {
-                Date date = sdf.parse(baseMonth);
+            if (baseStartMonth != null) {
+                Date date = sdf.parse(baseStartMonth);
                 calendar.setTime(date);
             }
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/vo/comment/UserCommentVo.java

@@ -74,6 +74,8 @@ public class UserCommentVo {
 
     private Integer childSize;
 
+    private String avatar;
+
     /** 孩子评论 */
     private List<UserCommentVo> child;