1.开课加入开始结束时间

2.系统人员列表及课程关联人员列表加学号检索

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

@@ -94,6 +94,7 @@ public class CourseStudentRelateController {
         Map param =new HashMap();
         param.put("courseId", req.getParameter("courseId"));
         param.put("queryInfo", req.getParameter("queryInfo"));
+        param.put("studentNum", req.getParameter("studentNum"));
         param.put("gender", req.getParameter("gender"));
         param.put("userStatus", req.getParameter("userStatus"));
         param.put("latestLoginStartTime", req.getParameter("latestLoginStartTime"));

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

@@ -75,6 +75,14 @@ public class CourseOpen {
     @ApiModelProperty(value = "状态，0正常，1已取消，2临时", position = 11)
     private String status;
 
+    /** 开始时间 */
+    @ApiModelProperty(value = "开始时间", position = 11)
+    private String startTime;
+
+    /** 结束时间 */
+    @ApiModelProperty(value = "结束时间", position = 11)
+    private String endTime;
+
     /** 删除标记(NOT_DELETE-未删除) */
     @ApiModelProperty(value = "删除标记(NOT_DELETE-未删除)", position = 12)
     @TableLogic

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

@@ -18,6 +18,8 @@
             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_OPEN_SCHEDULE_TIME') )dd1 WHERE dd1.DICT_VALUE = TRIM(co.SCHEDULE_TIME) ),'') AS scheduleTimeName,
             IFNULL(co.START_PERIOD ,'') AS startPeriod,
             IFNULL(co.END_PERIOD ,'') AS endPeriod,
+            IFNULL(co.START_TIME ,'') AS startTime,
+            IFNULL(co.END_TIME ,'') AS endTime,
             IFNULL(co.WEEK_TYPE ,'') AS weekType,
             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_OPEN_WEEK_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(co.WEEK_TYPE) ),'') AS weekTypeName,
             IFNULL(co.STATUS ,'') AS status,
@@ -64,6 +66,8 @@
             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_OPEN_SCHEDULE_TIME') )dd1 WHERE dd1.DICT_VALUE = TRIM(co.SCHEDULE_TIME) ),'') AS scheduleTimeName,
             IFNULL(co.START_PERIOD ,'') AS startPeriod,
             IFNULL(co.END_PERIOD ,'') AS endPeriod,
+            IFNULL(co.START_TIME ,'') AS startTime,
+            IFNULL(co.END_TIME ,'') AS endTime,
             IFNULL(co.WEEK_TYPE ,'') AS weekType,
             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_OPEN_WEEK_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(co.WEEK_TYPE) ),'') AS weekTypeName,
             IFNULL(co.STATUS ,'') AS status,

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

@@ -29,6 +29,9 @@
         <if test="param.courseId !=null and param.courseId != ''">
             and csr.COURSE_ID=#{param.courseId}
         </if>
+        <if test="param.studentNum !=null and param.studentNum != ''">
+            and su.STUDENT_NUM like CONCAT('%',#{param.studentNum}, '%')
+        </if>
         <if test="param.queryInfo !=null and param.gender != ''">
             and (su.NAME like CONCAT('%',#{param.queryInfo}, '%') or su.ACCOUNT like CONCAT('%',#{param.queryInfo}, '%') or su.PHONE like CONCAT('%',#{param.queryInfo}, '%'))
         </if>

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

@@ -68,4 +68,12 @@ public class CourseOpenAddParam {
     @ApiModelProperty(value = "状态，0正常，1已取消，2临时", position = 11)
     private String status;
 
+    /** 开始时间 */
+    @ApiModelProperty(value = "开始时间", position = 11)
+    private String startTime;
+
+    /** 结束时间 */
+    @ApiModelProperty(value = "结束时间", position = 11)
+    private String endTime;
+
 }

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

@@ -74,4 +74,12 @@ public class CourseOpenEditParam {
     @ApiModelProperty(value = "状态，0正常，1已取消，2临时", position = 11)
     private String status;
 
+    /** 开始时间 */
+    @ApiModelProperty(value = "开始时间", position = 11)
+    private String startTime;
+
+    /** 结束时间 */
+    @ApiModelProperty(value = "结束时间", position = 11)
+    private String endTime;
+
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserPageParam.java

@@ -72,4 +72,8 @@ public class SysUserPageParam {
     @ApiModelProperty(value = "学历", position = 21)
     private String education;
 
+    /** 学号 */
+    @ApiModelProperty(value = "学号", position = 7)
+    private String studentNum;
+
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java

@@ -240,6 +240,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (ObjectUtil.isNotEmpty(sysUserPageParam.getOrgId())) {
             queryWrapper.lambda().eq(SysUser::getOrgId, sysUserPageParam.getOrgId());
         }
+        if (ObjectUtil.isNotEmpty(sysUserPageParam.getStudentNum())) {
+            queryWrapper.lambda().like(SysUser::getStudentNum, sysUserPageParam.getStudentNum());
+        }
         if (ObjectUtil.isNotEmpty(sysUserPageParam.getUserStatus())) {
             queryWrapper.lambda().eq(SysUser::getUserStatus, sysUserPageParam.getUserStatus());
         }
@@ -361,6 +364,29 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         queryWrapper.lambda().orderByAsc(SysUser::getSortCode);
         Page<SysUser> jsonList =  this.page(CommonPageRequest.defaultPage(),queryWrapper);
+        List<SysUser> sysUserList = jsonList.getRecords();
+        List<String> sysUserIdList=CollStreamUtil.toList(sysUserList, SysUser::getId);
+
+        //补全其他基础信息
+        Map param=new HashMap();
+        param.put("idList",sysUserIdList);
+        List<Map<String, Object>> otherInfoList=sysUserMapper.getOtherInfoList(param);
+        // 将 otherInfoList 转为 Map<用户ID, 附加信息> 方便快速查找
+        Map<String, Map<String, Object>> otherInfoMap = otherInfoList.stream()
+                .collect(Collectors.toMap(
+                        info -> info.get("id").toString(), // 假设 Map 中有 userId 字段
+                        info -> info
+                ));
+
+        // 遍历用户列表并赋值
+        sysUserList.forEach(sysUser -> {
+            Map<String, Object> otherInfo = otherInfoMap.get(sysUser.getId());
+            if (otherInfo != null) {
+                sysUser.setCollegeAllId(otherInfo.get("collegeAllId").toString());
+                sysUser.setCollegeAllIdName(otherInfo.get("collegeAllIdName").toString());
+                sysUser.setEduIdentityName(otherInfo.get("eduIdentityName").toString());
+            }
+        });
         return jsonList;
     }