1.课程功能应需求完善，修改完善课程，章节，课时相关功能代码

2.将院系全部搬迁成系统组织，修改相关接口，以及搬运一些相关接口

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/ChapterController.java → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseChapterController.java

@@ -13,6 +13,7 @@
 package vip.xiaonuo.disk.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
@@ -27,6 +28,7 @@ import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
 import vip.xiaonuo.disk.domain.Chapter;
+import vip.xiaonuo.disk.domain.CourseInfo;
 import vip.xiaonuo.disk.param.ChapterAddParam;
 import vip.xiaonuo.disk.param.ChapterEditParam;
 import vip.xiaonuo.disk.param.ChapterIdParam;
@@ -34,8 +36,12 @@ import vip.xiaonuo.disk.param.ChapterPageParam;
 import vip.xiaonuo.disk.service.ChapterService;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 课程章节表控制器
@@ -47,7 +53,7 @@ import javax.validation.constraints.NotEmpty;
 @ApiSupport(author = "SNOWY_TEAM", order = 1)
 @RestController
 @Validated
-public class ChapterController {
+public class CourseChapterController {
 
     @Resource
     private ChapterService chapterService;
@@ -62,8 +68,13 @@ public class ChapterController {
     @ApiOperation("获取课程章节表分页")
     @SaCheckPermission("/disk/chapter/page")
     @GetMapping("/disk/chapter/page")
-    public CommonResult<Page<Chapter>> page(ChapterPageParam chapterPageParam) {
-        return CommonResult.data(chapterService.page(chapterPageParam));
+    public CommonResult<Page<Map<String,Object>>> page(ChapterPageParam chapterPageParam, HttpServletRequest req) {
+        Map param =new HashMap();
+        param.put("courseId", req.getParameter("courseId"));
+        param.put("name", req.getParameter("name"));
+
+        Page<Map<String,Object>> list=chapterService.queryList(param);
+        return CommonResult.data(list);
     }
 
     /**
@@ -78,7 +89,8 @@ public class ChapterController {
     @SaCheckPermission("/disk/chapter/add")
     @PostMapping("/disk/chapter/add")
     public CommonResult<String> add(@RequestBody @Valid ChapterAddParam chapterAddParam) {
-        chapterService.add(chapterAddParam);
+        Chapter chapter = BeanUtil.toBean(chapterAddParam, Chapter.class);
+        chapter=chapterService.addOne(chapter);
         return CommonResult.ok();
     }
 
@@ -94,7 +106,8 @@ public class ChapterController {
     @SaCheckPermission("/disk/chapter/edit")
     @PostMapping("/disk/chapter/edit")
     public CommonResult<String> edit(@RequestBody @Valid ChapterEditParam chapterEditParam) {
-        chapterService.edit(chapterEditParam);
+        Chapter chapter = BeanUtil.toBean(chapterEditParam, Chapter.class);
+        chapter=chapterService.editOne(chapter);
         return CommonResult.ok();
     }
 
@@ -125,8 +138,11 @@ public class ChapterController {
     @ApiOperation("获取课程章节表详情")
     @SaCheckPermission("/disk/chapter/detail")
     @GetMapping("/disk/chapter/detail")
-    public CommonResult<Chapter> detail(@Valid ChapterIdParam chapterIdParam) {
-        return CommonResult.data(chapterService.detail(chapterIdParam));
+    public CommonResult<Map<String,Object>> detail(@Valid ChapterIdParam chapterIdParam, HttpServletRequest req) {
+        Map param =new HashMap();
+        param.put("id", req.getParameter("id"));
+        Map<String,Object> result=chapterService.queryInfo(param);
+        return CommonResult.data(result);
     }
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/ClassHourController.java → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseClassHourController.java

@@ -13,6 +13,7 @@
 package vip.xiaonuo.disk.controller;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
@@ -48,7 +49,7 @@ import javax.validation.constraints.NotEmpty;
 @ApiSupport(author = "SNOWY_TEAM", order = 1)
 @RestController
 @Validated
-public class ClassHourController {
+public class CourseClassHourController {
 
     @Resource
     private ClassHourService classHourService;
@@ -77,7 +78,10 @@ public class ClassHourController {
     @CommonLog("添加课时表")
     @PostMapping("/disk/hour/add")
     public CommonResult<String> add(@RequestBody @Valid ClassHourAddParam classHourAddParam) {
-        classHourService.add(classHourAddParam);
+        ClassHour classHour = BeanUtil.toBean(classHourAddParam, ClassHour.class);
+        classHourService.addOne(classHour);
+        //同时存入该课时的关联文件
+
         return CommonResult.ok();
     }
 
@@ -92,7 +96,11 @@ public class ClassHourController {
     @CommonLog("编辑课时表")
     @PostMapping("/disk/hour/edit")
     public CommonResult<String> edit(@RequestBody @Valid ClassHourEditParam classHourEditParam) {
-        classHourService.edit(classHourEditParam);
+        ClassHour classHour = classHourService.queryEntity(classHourEditParam.getId());
+        BeanUtil.copyProperties(classHourEditParam, classHour);
+        classHourService.editOne(classHour);
+        //同时存入该课时的关联文件
+
         return CommonResult.ok();
     }
 

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

@@ -19,6 +19,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -163,6 +164,26 @@ public class CourseInfoController {
         return CommonResult.ok();
     }
 
+    /**
+     * 课程信息-修改状态
+     *
+     * @author honorfire
+     * @date  2025/06/20 15:00
+     */
+    @ApiOperationSupport(order = 3)
+    @ApiOperation("课程信息-修改状态")
+    @CommonLog("课程信息-修改状态")
+    @SaCheckPermission("/disk/courseinfo/updateStatus")
+    @PostMapping("/disk/courseinfo/updateStatus")
+    public CommonResult<String> updateStatus(@RequestBody @Valid CourseInfoEditParam courseInfoEditParam) {
+        if(StringUtils.isEmpty(courseInfoEditParam.getVerifyStatus()) && StringUtils.isEmpty(courseInfoEditParam.getPutawayStatus()))return CommonResult.error("修改状态不能为空");
+        //先更新课程信息
+        CourseInfo courseInfo = BeanUtil.toBean(courseInfoEditParam, CourseInfo.class);
+        courseInfoService.editOne(courseInfo);
+
+        return CommonResult.ok();
+    }
+
     /**
      * 删除课程信息表
      *

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

@@ -27,7 +27,7 @@ import java.util.Date;
  **/
 @Getter
 @Setter
-@TableName("chapter")
+@TableName("COURSE_CHAPTER")
 public class Chapter {
 
     /** 主键 */

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

@@ -27,7 +27,7 @@ import java.util.Date;
  **/
 @Getter
 @Setter
-@TableName("class_hour")
+@TableName("COURSE_CLASSHOUR")
 public class ClassHour {
 
     /** 主键 */

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

@@ -127,4 +127,15 @@ public class CourseInfo {
     @ApiModelProperty(value = "课程信息", position = 13)
     private String info;
 
+    /** 二级院系ID */
+    @ApiModelProperty(value = "二级院系ID", position = 7)
+    private String collegeTwoId;
+
+    /** 三级院系ID */
+    @ApiModelProperty(value = "三级院系ID", position = 7)
+    private String collegeThreeId;
+
+    /** 上架状态 */
+    @ApiModelProperty(value = "上架状态", position = 7)
+    private String putawayStatus;
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/dto/courseInfo/CourseInfoAddParam.java

@@ -97,5 +97,19 @@ public class CourseInfoAddParam {
     @ApiModelProperty(value = "课程信息", position = 13)
     private String info;
 
+    /** 二级院系ID */
+    @ApiModelProperty(value = "二级院系ID", position = 7)
+    @NotBlank(message = "二级院系ID不能为空")
+    private String collegeTwoId;
+
+    /** 三级院系ID */
+    @ApiModelProperty(value = "三级院系ID", position = 7)
+    @NotBlank(message = "三级院系ID不能为空")
+    private String collegeThreeId;
+
+    /** 上架状态 */
+    @ApiModelProperty(value = "上架状态", position = 7)
+    private String putawayStatus;
+
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/dto/courseInfo/CourseInfoEditParam.java

@@ -94,12 +94,22 @@ public class CourseInfoEditParam {
 
     /** 课程审核记录id */
     @ApiModelProperty(value = "课程审核记录id", position = 2)
-    @NotBlank(message = "课程审核记录id不能为空")
     private String courseAuditId;
 
     /** 课程信息 */
     @ApiModelProperty(value = "课程信息", position = 13)
     private String info;
 
+    /** 二级院系ID */
+    @ApiModelProperty(value = "二级院系ID", position = 7)
+    private String collegeTwoId;
+
+    /** 三级院系ID */
+    @ApiModelProperty(value = "三级院系ID", position = 7)
+    private String collegeThreeId;
+
+    /** 上架状态 */
+    @ApiModelProperty(value = "上架状态", position = 7)
+    private String putawayStatus;
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/ChapterMapper.java

@@ -13,8 +13,12 @@
 package vip.xiaonuo.disk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.disk.domain.Chapter;
 
+import java.util.Map;
+
 
 /**
  * 课程章节表Mapper接口
@@ -23,4 +27,14 @@ import vip.xiaonuo.disk.domain.Chapter;
  * @date  2025/07/02 15:34
  **/
 public interface ChapterMapper extends BaseMapper<Chapter> {
+
+    /**
+     * 课程章节-分页列表
+     */
+    Page<Map<String,Object>> queryList(@Param("param") Map param, @Param("page") Page<Object> page);
+
+    /**
+     * 课程章节-详情
+     */
+    Map<String,Object> queryInfo(Map param);
 }

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

@@ -20,6 +20,7 @@ import vip.xiaonuo.disk.param.ClassHourPageParam;
 import vip.xiaonuo.disk.vo.classhour.ClassHourVo;
 
 import javax.validation.constraints.NotNull;
+import java.util.Map;
 
 
 /**
@@ -34,4 +35,14 @@ public interface ClassHourMapper extends BaseMapper<ClassHour> {
 
 
     ClassHourVo detail(@NotNull(message = "id不能为空") Integer id);
+
+    /**
+     * 课程章节-分页列表
+     */
+    Page<Map<String,Object>> queryList(@Param("param") Map param, @Param("page") Page<Object> page);
+
+    /**
+     * 课程章节-详情
+     */
+    Map<String,Object> queryInfo(Map param);
 }

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

@@ -1,5 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="vip.xiaonuo.disk.modular.chapter.mapper.ChapterMapper">
+<mapper namespace="vip.xiaonuo.disk.mapper.ChapterMapper">
+
+    <select id="queryList" resultType="java.util.Map">
+        SELECT
+            IFNULL(cc.id,'') AS id,
+            IFNULL(cc.pid,'') AS pid,
+            IFNULL(cc.name,'') AS name,
+            IFNULL(cc.course_id,'') AS courseId
+        FROM COURSE_CHAPTER cc
+        WHERE cc.DELETE_FLAG ='NOT_DELETE'
+        <if test="param.courseId !=null and param.courseId != ''">
+            and cc.course_id=#{param.courseId}
+        </if>
+    </select>
+
+    <select id="queryInfo" resultType="java.util.Map">
+        SELECT
+            IFNULL(cc.id,'') AS id,
+            IFNULL(cc.pid,'') AS pid,
+            IFNULL(cc.name,'') AS name,
+            IFNULL(cc.course_id,'') ascourseId
+        FROM COURSE_CHAPTER cc
+        <if test="id !=null and id != ''">
+            and cc.id=#{id}
+        </if>
+    </select>
+
 
 </mapper>

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."class_hour" a
+           SYSDBA."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."class_hour" a
+            SYSDBA."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

@@ -22,9 +22,9 @@
             d.name collegeThreeName
         FROM
             SYSDBA."class_team" a
-        LEFT JOIN college b ON   a.COLLEGE_ID = b.id
-        LEFT JOIN college c ON   a.COLLEGE_TWO_ID = c.id
-        LEFT JOIN college d ON   a.COLLEGE_THREE_ID = d.id
+        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
         LEFT JOIN major e   ON   a.MAJOR_ID = e.id
         <where>
               <if test="classTeamPageParam.className != null and classTeamPageParam.className != ''">
@@ -54,9 +54,9 @@
             d.name collegeThreeName
         FROM
             SYSDBA."class_team" a
-        LEFT JOIN college b ON   a.COLLEGE_ID = b.id
-        LEFT JOIN college c ON   a.COLLEGE_TWO_ID = c.id
-        LEFT JOIN college d ON   a.COLLEGE_THREE_ID = d.id
+        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
         LEFT JOIN major e   ON   a.MAJOR_ID = e.id
         where a.id=#{id}
     </select>

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

@@ -11,7 +11,7 @@
             IFNULL (TO_CHAR(t1.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS'),'')  as uploadTime,
             IFNULL (t2.EXTEND_NAME,'') AS suffix,
             IFNULL (t1.VERIFY_STATUS,'') as verifyStatus,
-            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='COURSE_VERIFY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.VERIFY_STATUS) ),'') AS verifyStatusName,
+            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='RESOURSE_VERIFY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.VERIFY_STATUS) ),'') AS verifyStatusName,
             IFNULL (t1.COLLEGE_ID,'') AS collegeId,
             IFNULL (t4.NAME,'') AS collegeIdName,
             IFNULL (t1.COLLEGE_TWO_ID,'') AS collegeTwoId,
@@ -36,10 +36,10 @@
         LEFT JOIN resource_type rt  ON t1.RESOURCE_TYPE =rt.ID AND rt.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN resource_type rt2  ON t1.RESOURCE_TWO_TYPE =rt2.ID AND rt2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN COURSE_INFO t3 ON t1.COURSE_ID =t3.COURSE_ID AND t3.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN major t5 ON t1.MAJOR_ID=t5.id AND t5.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t42 ON t1.COLLEGE_TWO_ID=t42.id AND t42.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t43 ON t1.COLLEGE_THREE_ID=t43.id AND t43.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t42 ON t1.COLLEGE_TWO_ID=t42.id AND t42.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t43 ON t1.COLLEGE_THREE_ID=t43.id AND t43.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN DEV_FILE t6 ON t1.COVER_IMAGE=t6.ID AND t6.DELETE_FLAG ='NOT_DELETE'
         WHERE t1.DELETE_FLAG ='NOT_DELETE'
         <if test="param.userId!=null and param.userId != ''">
@@ -88,7 +88,7 @@
         IFNULL (t2.FILE_NAME,'') AS fileName,
         IFNULL (TO_CHAR(t1.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS'),'')  as uploadTime,
         IFNULL (t1.VERIFY_STATUS,'') as verifyStatus,
-        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='COURSE_VERIFY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.VERIFY_STATUS) ),'') AS verifyStatusName,
+        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='RESOURSE_VERIFY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.VERIFY_STATUS) ),'') AS verifyStatusName,
         IFNULL (t1.COLLEGE_ID,'') AS collegeId,
         IFNULL (t4.NAME,'') AS collegeIdName,
         IFNULL (t1.VIEW_COUNT,0) as viewCount,
@@ -97,10 +97,10 @@
         FROM RESOURCE_RECORD t1
         LEFT JOIN RESOURCE_USERFILE t2 ON t2.USER_FILE_ID = t1.USERFILE_ID AND t2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN COURSE_INFO t3 ON t1.COURSE_ID =t3.COURSE_ID AND t3.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN major t5 ON t1.MAJOR_ID=t5.id AND t5.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t42 ON t1.COLLEGE_TWO_ID=t42.id AND t42.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t43 ON t1.COLLEGE_THREE_ID=t43.id AND t43.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t42 ON t1.COLLEGE_TWO_ID=t42.id AND t42.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t43 ON t1.COLLEGE_THREE_ID=t43.id AND t43.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN DEV_FILE t6 ON t1.COVER_IMAGE=t6.ID AND t6.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_USER t7 ON t1.CREATE_USER =t7.ID AND t7.DELETE_FLAG ='NOT_DELETE'
         WHERE t1.DELETE_FLAG ='NOT_DELETE'
@@ -173,7 +173,7 @@
             IFNULL (TO_CHAR(t1.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS'),'')  as uploadTime,
             IFNULL (t2.EXTEND_NAME,'') AS suffix,
             IFNULL (t1.VERIFY_STATUS,'') as verifyStatus,
-            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='COURSE_VERIFY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.VERIFY_STATUS) ),'') AS verifyStatusName,
+            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='RESOURSE_VERIFY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.VERIFY_STATUS) ),'') AS verifyStatusName,
             IFNULL (t1.VIEW_COUNT,0) as viewCount,
             IFNULL (t1.COLLEGE_ID,'') AS collegeId,
             IFNULL (t4.NAME,'') AS collegeIdName,
@@ -207,10 +207,10 @@
         LEFT JOIN resource_type rt  ON t1.RESOURCE_TYPE =rt.ID AND rt.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN resource_type rt2  ON t1.RESOURCE_TWO_TYPE =rt2.ID AND rt2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN COURSE_INFO t3 ON t1.COURSE_ID =t3.COURSE_ID AND t3.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN major t5 ON t1.MAJOR_ID=t5.id AND t5.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t42 ON t1.COLLEGE_TWO_ID=t42.id AND t42.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t43 ON t1.COLLEGE_THREE_ID=t43.id AND t43.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t42 ON t1.COLLEGE_TWO_ID=t42.id AND t42.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t43 ON t1.COLLEGE_THREE_ID=t43.id AND t43.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN DEV_FILE t6 ON t1.COVER_IMAGE=t6.ID AND t6.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_USER t7 ON t1.CREATE_USER =t7.ID AND t7.DELETE_FLAG ='NOT_DELETE'
         WHERE t1.DELETE_FLAG ='NOT_DELETE'
@@ -247,10 +247,10 @@
         FROM RESOURCE_RECORD t1
         LEFT JOIN resource_type rt  ON t1.RESOURCE_TYPE =rt.ID AND rt.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN resource_type rt2  ON t1.RESOURCE_TWO_TYPE =rt2.ID AND rt2.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN major t5 ON t1.MAJOR_ID=t5.id AND t5.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t42 ON t1.COLLEGE_TWO_ID=t42.id AND t42.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college t43 ON t1.COLLEGE_THREE_ID=t43.id AND t43.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t42 ON t1.COLLEGE_TWO_ID=t42.id AND t42.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG t43 ON t1.COLLEGE_THREE_ID=t43.id AND t43.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN DEV_FILE t6 ON t1.COVER_IMAGE=t6.ID AND t6.DELETE_FLAG ='NOT_DELETE'
         WHERE t1.DELETE_FLAG ='NOT_DELETE'
         <if test="userId!=null and userId != ''">

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

@@ -4,72 +4,99 @@
 
     <select id="queryList" resultType="java.util.Map">
         select
-            t1.COURSE_ID as courseId,
-            t1.COURSE_NAME as courseName,
-            t1.COURSE_TYPE as courseType,
-            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='COURSE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.COURSE_TYPE) ),'') AS isCreaterName,
-            t1.COURSE_DESC as courseDesc,
-            t1.TEACHER_ID as teacherId,
-            t7.NAME AS teacherIdName,
-            t1.COLLEGE_ID AS collegeId,
-            t2.NAME AS collegeIdName,
-            t1.MAJOR_ID AS majorId,
-            t3.major_name AS majorIdName,
-            t1.PUBLISH_TIME as publishTime,
-            t1.TIME_LIMIT_TYPE as timeLimitType,
-            t1.START_TIME as startTime,
-            t1.END_TIME as endTime
-        FROM COURSE_INFO t1
-        LEFT JOIN college t2 ON t1.COLLEGE_ID=t2.ID AND t2.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN major t3 ON t1.MAJOR_ID=t3.id AND t3.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN SYS_USER t7 ON t7.ID=t1.TEACHER_ID AND t7.DELETE_FLAG ='NOT_DELETE'
-        WHERE t1.DELETE_FLAG ='NOT_DELETE'
+        ci.COURSE_ID as courseId,
+        IFNULL(ci.COURSE_NAME,'') as courseName,
+        IFNULL(ci.COURSE_TYPE,'') as courseType,
+        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='COURSE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(ci.COURSE_TYPE) ),'') AS isCreaterName,
+        IFNULL(ci.COURSE_DESC,'') as courseDesc,
+        IFNULL(ci.TEACHER_ID,'') as teacherId,
+        IFNULL(su.NAME,'') AS teacherIdName,
+        IFNULL(ci.COLLEGE_ID,'') AS collegeId,
+        IFNULL(co.NAME,'') AS collegeIdName,
+        IFNULL (ci.COLLEGE_TWO_ID,'') AS collegeTwoId,
+        IFNULL (co2.NAME,'') AS collegeTwoIdName,
+        IFNULL (ci.COLLEGE_THREE_ID,'') AS collegeThreeId,
+        IFNULL (co3.NAME,'') AS collegeThreeIdName,
+        CONCAT(ci.COLLEGE_ID,',',ci.COLLEGE_TWO_ID,',',ci.COLLEGE_THREE_ID) AS collegeAllId,
+        CONCAT(co.NAME,',',co2.NAME,',',co3.NAME) AS collegeAllIdName,
+        IFNULL(ci.MAJOR_ID,'') AS majorId,
+        IFNULL(ma.major_name,'') AS majorIdName,
+        IFNULL(ci.PUTAWAY_STATUS,'') as putawayStatus,
+        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='COURSE_PUTAWAY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(ci.PUTAWAY_STATUS) ),'') AS putawayStatusName,
+        IFNULL(ci.PUBLISH_TIME,'') as publishTime,
+        IFNULL(ci.TIME_LIMIT_TYPE,'') as timeLimitType,
+        IFNULL(ci.START_TIME,'') as startTime,
+        IFNULL(ci.END_TIME,'') as endTime
+        FROM COURSE_INFO ci
+        LEFT JOIN SYS_ORG co ON ci.COLLEGE_ID=co.ID AND co.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG co2 ON ci.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG co3 ON ci.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN major ma ON ci.MAJOR_ID=ma.id AND ma.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_USER su ON su.ID=ci.TEACHER_ID AND su.DELETE_FLAG ='NOT_DELETE'
+        WHERE ci.DELETE_FLAG ='NOT_DELETE'
         <if test="param.collegeId !=null and param.collegeId != ''">
-            and t1.COLLEGE_ID=#{param.courseId}
+            and ci.COLLEGE_ID=#{param.courseId}
+        </if>
+        <if test="param.collegeTwoId!=null and param.collegeTwoId != ''">
+            and ci.COLLEGE_TWO_ID=#{param.collegeTwoId}
+        </if>
+        <if test="param.collegeThreeId!=null and param.collegeThreeId != ''">
+            and ci.COLLEGE_THREE_ID=#{param.collegeThreeId}
         </if>
         <if test="param.majorId !=null and param.majorId != ''">
-            and t1.MAJOR_ID=#{param.majorId}
+            and ci.MAJOR_ID=#{param.majorId}
         </if>
         <if test="param.courseType !=null and param.courseType != ''">
-            and t1.COURSE_TYPE=#{param.courseType}
+            and ci.COURSE_TYPE=#{param.courseType}
         </if>
         <if test="param.courseName !=null and param.courseName != ''">
-            and t1.COURSE_NAME=#{param.courseName}
+            and ci.COURSE_NAME=#{param.courseName}
         </if>
         <if test="param.sortflag !=null and param.sortflag != ''">
             <if test=" param.sortflag == 0">
-                order by t1.PUBLISH_TIME desc
+                order by ci.CREATE_TIME desc
             </if>
             <if test=" param.sortflag == 1">
-                order by t1.VIEW_COUNT desc
+                order by ci.VIEW_COUNT desc
             </if>
         </if>
-        order by t1.COLLEGE_ID desc
+        order by ci.COLLEGE_ID desc
     </select>
 
     <select id="queryInfo" parameterType="java.util.Map" resultType="java.util.Map">
         select
-            t1.COURSE_ID as courseId,
-            t1.COURSE_NAME as courseName,
-            t1.COURSE_TYPE as courseType,
-            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='COURSE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.COURSE_TYPE) ),'') AS isCreaterName,
-            t1.COURSE_DESC as courseDesc,
-            t1.TEACHER_ID as teacherId,
-            t7.NAME AS teacherIdName,
-            t1.COLLEGE_ID AS collegeId,
-            t2.NAME AS collegeIdName,
-            t1.MAJOR_ID AS majorId,
-            t3.major_name AS majorIdName,
-            t1.PUBLISH_TIME as publishTime,
-            t1.TIME_LIMIT_TYPE as timeLimitType,
-            t1.START_TIME as startTime,
-            t1.END_TIME as endTime
-        FROM COURSE_INFO t1
-        LEFT JOIN college t2 ON t1.COLLEGE_ID=t2.ID AND t2.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN major t3 ON t1.MAJOR_ID=t3.id AND t3.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN SYS_USER t7 ON t7.ID=t1.TEACHER_ID AND t7.DELETE_FLAG ='NOT_DELETE'
+        ci.COURSE_ID as courseId,
+        IFNULL(ci.COURSE_NAME,'') as courseName,
+        IFNULL(ci.COURSE_TYPE,'') as courseType,
+        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='COURSE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(ci.COURSE_TYPE) ),'') AS isCreaterName,
+        IFNULL(ci.COURSE_DESC,'') as courseDesc,
+        IFNULL(ci.TEACHER_ID,'') as teacherId,
+        IFNULL(su.NAME,'') AS teacherIdName,
+        IFNULL(ci.COLLEGE_ID,'') AS collegeId,
+        IFNULL(co.NAME,'') AS collegeIdName,
+        IFNULL (ci.COLLEGE_TWO_ID,'') AS collegeTwoId,
+        IFNULL (co2.NAME,'') AS collegeTwoIdName,
+        IFNULL (ci.COLLEGE_THREE_ID,'') AS collegeThreeId,
+        IFNULL (co3.NAME,'') AS collegeThreeIdName,
+        CONCAT(ci.COLLEGE_ID,',',ci.COLLEGE_TWO_ID,',',ci.COLLEGE_THREE_ID) AS collegeAllId,
+        CONCAT(co.NAME,',',co2.NAME,',',co3.NAME) AS collegeAllIdName,
+        IFNULL(ci.MAJOR_ID,'') AS majorId,
+        IFNULL(ma.major_name,'') AS majorIdName,
+        IFNULL(ci.PUTAWAY_STATUS,'') as putawayStatus,
+        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='COURSE_PUTAWAY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(ci.PUTAWAY_STATUS) ),'') AS putawayStatusName,
+        IFNULL(ci.PUBLISH_TIME,'') as publishTime,
+        IFNULL(ci.TIME_LIMIT_TYPE,'') as timeLimitType,
+        IFNULL(ci.START_TIME,'') as startTime,
+        IFNULL(ci.END_TIME,'') as endTime
+        FROM COURSE_INFO ci
+        LEFT JOIN SYS_ORG co ON ci.COLLEGE_ID=co.ID AND co.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG co2 ON ci.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG co3 ON ci.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN major ma ON ci.MAJOR_ID=ma.id AND ma.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_USER su ON su.ID=ci.TEACHER_ID AND su.DELETE_FLAG ='NOT_DELETE'
+        where 1=1
         <if test="courseId !=null and courseId != ''">
-            and t1.COURSE_ID=#{courseId}
+            and ci.COURSE_ID=#{courseId}
         </if>
     </select>
 </mapper>

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

@@ -12,7 +12,7 @@
             a.create_user createUser
         FROM
             major a
-        LEFT JOIN college b ON a.college_id = b.id
+        LEFT JOIN SYS_ORG b ON a.college_id = b.id
        <where>
         <if test="majorPageParam.searchKey!=null">
             a.major_name like concat('%',#{majorPageParam.searchKey},'%')
@@ -33,7 +33,7 @@
             a.create_user createUser
         FROM
             major a
-                LEFT JOIN college b ON a.college_id = b.id
+                LEFT JOIN SYS_ORG b ON a.college_id = b.id
         where  a.id=#{id}
     </select>
 
@@ -48,7 +48,7 @@
             a.create_user createUser
         FROM
             major a
-                LEFT JOIN college b ON a.college_id = b.id
+                LEFT JOIN SYS_ORG b ON a.college_id = b.id
         where  a.college_id=#{collegeId}
     </select>
 </mapper>

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

@@ -24,9 +24,9 @@
                a.UPDATE_TIME updateTime,
                a.UPDATE_USER updateUser
         FROM SYSDBA."materrial_library" a
-         LEFT JOIN college b ON   a.COLLEGE_ID = b.id
-         LEFT JOIN college c ON   a.COLLEGE_TWO_ID = c.id
-         LEFT JOIN college d ON   a.COLLEGE_THREE_ID = d.id
+         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
          LEFT JOIN major e   ON   a.MAJOR_ID = d.id
          LEFT JOIN RESOURCE_USERFILE f ON a.USERFILE_ID=f.USER_FILE_ID
         <where>
@@ -58,9 +58,9 @@
         a.UPDATE_TIME updateTime,
         a.UPDATE_USER updateUser
         FROM SYSDBA."materrial_library" a
-        LEFT JOIN college b ON   a.COLLEGE_ID = b.id
-        LEFT JOIN college c ON   a.COLLEGE_ID = c.id
-        LEFT JOIN college d ON   a.COLLEGE_ID = d.id
+        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
         LEFT JOIN major e   ON   a.MAJOR_ID = d.id
         LEFT JOIN RESOURCE_USERFILE f ON a.USERFILE_ID=f.USER_FILE_ID
         where a.ID=#{id}

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

@@ -28,7 +28,7 @@
            e.name userName
        FROM
            SYSDBA."resource_collect" a
-       LEFT JOIN COURSE_AUDIT_RECORD b ON  	a."resource_id" = b.id
+       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
        LEFT JOIN sys_user e ON e.id = a."user_id"

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

@@ -15,12 +15,14 @@ package vip.xiaonuo.disk.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import vip.xiaonuo.disk.domain.Chapter;
+import vip.xiaonuo.disk.domain.CourseInfo;
 import vip.xiaonuo.disk.param.ChapterAddParam;
 import vip.xiaonuo.disk.param.ChapterEditParam;
 import vip.xiaonuo.disk.param.ChapterIdParam;
 import vip.xiaonuo.disk.param.ChapterPageParam;
 
 import java.util.List;
+import java.util.Map;
 
 ;
 
@@ -48,6 +50,14 @@ public interface ChapterService extends IService<Chapter> {
      */
     void add(ChapterAddParam chapterAddParam);
 
+    /**
+     * 课程章节-添加
+     *
+     * @author honorfire
+     * @date  2025/06/20 15:00
+     */
+    Chapter addOne(Chapter chapter);
+
     /**
      * 编辑课程章节表
      *
@@ -56,6 +66,14 @@ public interface ChapterService extends IService<Chapter> {
      */
     void edit(ChapterEditParam chapterEditParam);
 
+    /**
+     * 课程章节-编辑
+     *
+     * @author honorfire
+     * @date  2025/06/20 15:00
+     */
+    Chapter editOne(Chapter chapter);
+
     /**
      * 删除课程章节表
      *
@@ -80,4 +98,14 @@ public interface ChapterService extends IService<Chapter> {
      **/
     Chapter queryEntity(Integer id);
 
+    /**
+     *  课程章节-分页列表
+     */
+    Page<Map<String,Object>> queryList(Map param);
+
+    /**
+     *  课程章节-详情
+     */
+    Map<String,Object> queryInfo(Map param);
+
 }

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

@@ -14,6 +14,7 @@ package vip.xiaonuo.disk.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import vip.xiaonuo.disk.domain.Chapter;
 import vip.xiaonuo.disk.domain.ClassHour;
 import vip.xiaonuo.disk.param.ClassHourAddParam;
 import vip.xiaonuo.disk.param.ClassHourEditParam;
@@ -22,6 +23,7 @@ import vip.xiaonuo.disk.param.ClassHourPageParam;
 import vip.xiaonuo.disk.vo.classhour.ClassHourVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课时表Service接口
@@ -47,6 +49,14 @@ public interface ClassHourService extends IService<ClassHour> {
      */
     void add(ClassHourAddParam classHourAddParam);
 
+    /**
+     * 课时-添加
+     *
+     * @author honorfire
+     * @date  2025/06/20 15:00
+     */
+    ClassHour addOne(ClassHour classHour);
+
     /**
      * 编辑课时表
      *
@@ -55,6 +65,14 @@ public interface ClassHourService extends IService<ClassHour> {
      */
     void edit(ClassHourEditParam classHourEditParam);
 
+    /**
+     * 课时-编辑
+     *
+     * @author honorfire
+     * @date  2025/06/20 15:00
+     */
+    ClassHour editOne(ClassHour classHour);
+
     /**
      * 删除课时表
      *
@@ -79,4 +97,14 @@ public interface ClassHourService extends IService<ClassHour> {
      **/
     ClassHour queryEntity(Integer id);
 
+    /**
+     *  课程课时-分页列表
+     */
+    Page<Map<String,Object>> queryList(Map param);
+
+    /**
+     *  课程课时-详情
+     */
+    Map<String,Object> queryInfo(Map param);
+
 }

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

@@ -32,7 +32,9 @@ import vip.xiaonuo.disk.param.ChapterIdParam;
 import vip.xiaonuo.disk.param.ChapterPageParam;
 import vip.xiaonuo.disk.service.ChapterService;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课程章节表Service接口实现类
@@ -43,6 +45,8 @@ import java.util.List;
 @Service
 public class ChapterServiceImpl extends ServiceImpl<ChapterMapper, Chapter> implements ChapterService {
 
+    @Resource
+    private ChapterMapper chapterMapper;
 
     @Override
     public Page<Chapter> page(ChapterPageParam chapterPageParam) {
@@ -64,6 +68,13 @@ public class ChapterServiceImpl extends ServiceImpl<ChapterMapper, Chapter> impl
         this.save(chapter);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Chapter addOne(Chapter chapter) {
+        this.save(chapter);
+        return chapter;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(ChapterEditParam chapterEditParam) {
@@ -72,6 +83,13 @@ public class ChapterServiceImpl extends ServiceImpl<ChapterMapper, Chapter> impl
         this.updateById(chapter);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Chapter editOne(Chapter chapter) {
+        this.updateById(chapter);
+        return chapter;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(List<ChapterIdParam> chapterIdParamList) {
@@ -93,4 +111,16 @@ public class ChapterServiceImpl extends ServiceImpl<ChapterMapper, Chapter> impl
         return chapter;
     }
 
+    @Override
+    public Page<Map<String,Object>> queryList(Map param)
+    {
+        return chapterMapper.queryList(param,CommonPageRequest.defaultPage());
+    }
+
+    @Override
+    public Map<String,Object> queryInfo(Map param)
+    {
+        return chapterMapper.queryInfo(param);
+    }
+
 }

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

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
+import vip.xiaonuo.disk.domain.Chapter;
 import vip.xiaonuo.disk.domain.ClassHour;
 import vip.xiaonuo.disk.mapper.ClassHourMapper;
 import vip.xiaonuo.disk.param.ClassHourAddParam;
@@ -34,6 +35,7 @@ import vip.xiaonuo.disk.param.ClassHourPageParam;
 import vip.xiaonuo.disk.service.ClassHourService;
 import vip.xiaonuo.disk.vo.classhour.ClassHourVo;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课时表Service接口实现类
@@ -58,6 +60,13 @@ public class ClassHourServiceImpl extends ServiceImpl<ClassHourMapper, ClassHour
         this.save(classHour);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public ClassHour addOne(ClassHour classHour) {
+        this.save(classHour);
+        return classHour;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(ClassHourEditParam classHourEditParam) {
@@ -66,6 +75,13 @@ public class ClassHourServiceImpl extends ServiceImpl<ClassHourMapper, ClassHour
         this.updateById(classHour);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public ClassHour editOne(ClassHour classHour) {
+        this.updateById(classHour);
+        return classHour;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(List<ClassHourIdParam> classHourIdParamList) {
@@ -87,4 +103,18 @@ public class ClassHourServiceImpl extends ServiceImpl<ClassHourMapper, ClassHour
         return classHour;
     }
 
+    @Override
+    public Page<Map<String,Object>> queryList(Map param)
+    {
+        return classHourMapper.queryList(param,CommonPageRequest.defaultPage());
+    }
+
+    @Override
+    public Map<String,Object> queryInfo(Map param)
+    {
+        return classHourMapper.queryInfo(param);
+    }
+
+
+
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java

@@ -18,6 +18,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,15 +27,21 @@ import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
+import vip.xiaonuo.common.util.TreeUtil;
 import vip.xiaonuo.sys.modular.org.entity.SysOrg;
 import vip.xiaonuo.sys.modular.org.param.*;
 import vip.xiaonuo.sys.modular.org.service.SysOrgService;
 import vip.xiaonuo.sys.modular.user.entity.SysUser;
+import vip.xiaonuo.sys.modular.user.service.SysUserService;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 组织控制器
@@ -50,6 +57,8 @@ public class SysOrgController {
 
     @Resource
     private SysOrgService sysOrgService;
+    @Resource
+    private SysUserService sysUserService;
 
     /**
      * 获取组织分页
@@ -151,6 +160,19 @@ public class SysOrgController {
         return CommonResult.data(sysOrgService.orgTreeSelector());
     }
 
+    /**
+     * 获取组织树
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:00
+     */
+    @ApiOperationSupport(order = 2)
+    @ApiOperation("获取组织树")
+    @GetMapping("/sys/org/treeAll")
+    public CommonResult<List<Tree<String>>> treeAll() {
+        return CommonResult.data(sysOrgService.treeAll());
+    }
+
     /**
      * 获取用户选择器
      *
@@ -163,4 +185,73 @@ public class SysOrgController {
     public CommonResult<Page<SysUser>> userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam) {
         return CommonResult.data(sysOrgService.userSelector(sysOrgSelectorUserParam));
     }
+
+
+    /**
+     * 获取组织人员树-一次查回（担心卡，暂时不采用，预备用）
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:00
+     */
+    @ApiOperationSupport(order = 7)
+    @ApiOperation("获取组织人员树-一次查回")
+    @GetMapping("/sys/org/orgUserTreeSelector")
+    public CommonResult<List<Map<String,Object>>> orgUserTreeSelector(HttpServletRequest req) {
+        Map param=new HashMap();
+        Map result = new HashMap();
+        String collegeParentId = "0";
+        if(StringUtils.isNotEmpty(req.getParameter("collegeParentId")))collegeParentId=req.getParameter("collegeParentId");
+        //用于装当前单位的map
+        Map nowData = new HashMap();
+        List<Map<String, Object>> tree = new ArrayList<>();
+        //最终用来化成树的集合
+        List<Map<String,Object>> dataList=new ArrayList<>();
+        //查询该父级id的子级院系
+        List<Map<String,Object>> orgList=sysOrgService.getOrgUserChildList(param);
+        List<Map<String,Object>> userList=sysUserService.getOrgUserChildList(param);
+        dataList.addAll(orgList);
+        dataList.addAll(userList);
+        for(Map one:dataList)
+        {
+            if(one.get("id").equals(collegeParentId))
+            {
+                nowData=one;
+                break;
+            }
+
+        }
+        tree = TreeUtil.getThree(dataList,collegeParentId);
+
+        //如果传进来的id不为空，则把传进来的id也作为一条数据
+        List<Map<String,Object>> resultList=new ArrayList<>();
+        if(nowData.get("id")!=null)
+        {
+            nowData.put("children",tree);
+            resultList.add(nowData);
+            result.put("result",resultList);
+        }
+        else
+        {
+            resultList.addAll(tree);
+        }
+        return CommonResult.data(resultList);
+    }
+
+    /**
+     * 获取组织人员树-分级请求
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:00
+     */
+    @ApiOperationSupport(order = 7)
+    @ApiOperation("获取组织人员树-分级请求")
+    @GetMapping("/sys/org/orgUserTreeRespectively")
+    public CommonResult<List<Map<String, Object>>> orgUserTreeRespectively(HttpServletRequest req) {
+        Map param =new HashMap();
+        String collegeParentId="0";
+        if(StringUtils.isNotEmpty(req.getParameter("collegeParentId")))collegeParentId=req.getParameter("collegeParentId");
+        param.put("collegeParentId",collegeParentId );
+        List<Map<String, Object>> result=sysOrgService.orgUserTreeRespectively(param);
+        return CommonResult.data(result);
+    }
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/mapper/SysOrgMapper.java

@@ -18,6 +18,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.sys.modular.org.entity.SysOrg;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 组织Mapper接口
  *
@@ -26,6 +29,11 @@ import vip.xiaonuo.sys.modular.org.entity.SysOrg;
  **/
 public interface SysOrgMapper extends BaseMapper<SysOrg> {
 
+    /**
+     * 获取组织人员树-院系部分
+     * */
+    List<Map<String, Object>> getOrgUserChildList(Map param);
+
     /**
      * 删除数据并忽略插件（逻辑删除、租户拼接）
      *

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/mapper/mapping/SysOrgMapper.xml

@@ -5,4 +5,16 @@
     <delete id="deleteIgnoreInterceptor">
         DELETE FROM SYS_ORG ${ew.customSqlSegment}
     </delete>
-</mapper>
+    <select id="getOrgUserChildList" resultType="java.util.Map">
+        SELECT
+        t1.ID AS id,
+        t1.NAME AS name,
+        t1.PARENT_ID AS parentId,
+        'college' AS infoType
+        FROM SYS_ORG t1
+        WHERE t1.DELETE_FLAG = 'NOT_DELETE'
+        <if test="collegeParentId !=null and collegeParentId != ''">
+            AND t1.PARENT_ID =#{collegeParentId}
+        </if>
+    </select>
+</mapper>

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/service/SysOrgService.java

@@ -20,6 +20,7 @@ import vip.xiaonuo.sys.modular.org.param.*;
 import vip.xiaonuo.sys.modular.user.entity.SysUser;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 组织Service接口
@@ -158,6 +159,14 @@ public interface SysOrgService extends IService<SysOrg> {
      */
     List<Tree<String>> orgTreeSelector();
 
+    /**
+     * 获取组织树
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:08
+     */
+    List<Tree<String>> treeAll();
+
     /**
      * 获取组织列表选择器
      *
@@ -173,5 +182,18 @@ public interface SysOrgService extends IService<SysOrg> {
      * @date 2022/4/24 20:08
      */
     Page<SysUser> userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam);
+
+    /**
+     * 获取组织人员树-分级请求
+     *
+     * @author xuyuxiang
+     * @date 2022/7/22 13:34
+     **/
+    List<Map<String, Object>> orgUserTreeRespectively(Map param);
+
+    /**
+     * 获取组织人员树-人员部分
+     * */
+    List<Map<String, Object>> getOrgUserChildList(Map param);
 }
 

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java

@@ -44,11 +44,14 @@ import vip.xiaonuo.sys.modular.position.service.SysPositionService;
 import vip.xiaonuo.sys.modular.role.entity.SysRole;
 import vip.xiaonuo.sys.modular.role.service.SysRoleService;
 import vip.xiaonuo.sys.modular.user.entity.SysUser;
+import vip.xiaonuo.sys.modular.user.mapper.SysUserMapper;
 import vip.xiaonuo.sys.modular.user.service.SysUserService;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -69,6 +72,12 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Resource
     private SysUserService sysUserService;
 
+    @Resource
+    private SysUserMapper sysUserMapper;
+
+    @Resource
+    private SysOrgMapper sysOrgMapper;
+
     @Override
     public Page<SysOrg> page(SysOrgPageParam sysOrgPageParam) {
         QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
@@ -267,6 +276,32 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         return TreeUtil.build(treeNodeList, "0");
     }
 
+    @Override
+    public List<Tree<String>> treeAll() {
+        List<SysOrg> collegeList = this.getAllOrgList();
+        List<TreeNode<String>> treeNodeList = collegeList.stream().map(org ->
+                new TreeNode<>(org.getId(), org.getParentId(),
+                        org.getName(), org.getSortCode()).setExtra(JSONUtil.parseObj(org)))
+                .collect(Collectors.toList());
+        List<Tree<String>> list= TreeUtil.build(treeNodeList, "0");
+        Tree<String>  tree=new Tree<String>();
+        tree.setName("全部");
+        list.add(0,tree);
+        for (int i = 1; i < list.size(); i++) {
+            List<Tree<String>> child = list.get(i).getChildren();
+            Tree<String>  tree1=new Tree<String>();
+            tree1.setName("全部");
+            child.add(0,tree1);
+            for (int j = 1; j < child.size(); j++) {
+                List<Tree<String>> gradchild = child.get(j).getChildren();
+                Tree<String>  gradtree=new Tree<String>();
+                gradtree.setName("全部");
+                gradchild.add(0,gradtree);
+            }
+        }
+        return list;
+    }
+
     @Override
     public Page<SysOrg> orgListSelector(SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam) {
         LambdaQueryWrapper<SysOrg> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -311,6 +346,35 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         }
     }
 
+    /**
+     * 获取组织人员树-院系部分
+     * */
+    @Override
+    public List<Map<String, Object>> getOrgUserChildList(Map param)
+    {
+        return sysOrgMapper.getOrgUserChildList(param);
+    }
+
+
+    /**
+     * 获取组织人员树-分级请求
+     *
+     * @author xuyuxiang
+     * @date 2022/7/22 13:34
+     **/
+    @Override
+    public List<Map<String, Object>> orgUserTreeRespectively(Map param) {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        //查询该父级院系id的子级院系
+        List<Map<String, Object>> collegeList = sysOrgMapper.getOrgUserChildList(param);
+        String collegeParentId = param.get("collegeParentId").toString();
+        //查询该父级id的子级人员
+        List<Map<String, Object>> userList = sysUserMapper.getOrgUserChildList(param);
+        resultList.addAll(collegeList);
+        resultList.addAll(userList);
+        return resultList;
+    }
+
     /* ====以下为各种递归方法==== */
 
     @Override

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/mapper/mapping/SysUserMapper.xml

@@ -48,9 +48,9 @@
             IFNULL (CONCAT(t1.COLLEGE_ID,',',t1.COLLEGE_TWO_ID,',',t1.COLLEGE_THREE_ID),'') AS collegeAllId,
             IFNULL (CONCAT(co1.NAME,',',co2.NAME,',',co3.NAME),'') AS collegeAllIdName
         FROM SYS_USER t1
-        LEFT JOIN college co1 ON t1.COLLEGE_ID=co1.id AND co1.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college co2 ON t1.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college co3 ON t1.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG co1 ON t1.COLLEGE_ID=co1.id AND co1.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG co2 ON t1.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG co3 ON t1.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'
         WHERE 1=1
         <if test="id !=null and id != ''">
             AND t1.ID =#{id}
@@ -70,9 +70,9 @@
             IFNULL (CONCAT(t1.COLLEGE_ID,',',t1.COLLEGE_TWO_ID,',',t1.COLLEGE_THREE_ID),'') AS collegeAllId,
             IFNULL (CONCAT(co1.NAME,',',co2.NAME,',',co3.NAME),'') AS collegeAllIdName
         FROM SYS_USER t1
-        LEFT JOIN college co1 ON t1.COLLEGE_ID=co1.id AND co1.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college co2 ON t1.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
-        LEFT JOIN college co3 ON t1.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG co1 ON t1.COLLEGE_ID=co1.id AND co1.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG co2 ON t1.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_ORG co3 ON t1.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'
         WHERE 1=1
         <if test="idList !=null and idList.size()>0">
             and t1.ID in