11.1

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java

@@ -125,7 +125,7 @@ public class DeptController {
     @PreAuthorize("@ss.hasPermission('system:dept:selfQuery')")
     public CommonResult<DeptRespVO> getUserDept() {
         Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
-        // TODO 你这里不是用了部门信息查询吗哈哈哈哈，user那些方法里怎么不用，还写了sql
+
         // 获取部门信息
         DeptDO dept = deptService.getUserDept();
         if (dept == null) {
@@ -156,7 +156,7 @@ public class DeptController {
                 supervisor.add(ad);
             }
         }
-        // TODO 人数可以直接使用sql 统计
+
         UserAchievementPageReqVO pageReqVO =new UserAchievementPageReqVO();
         pageReqVO.setDeptId(deptId);
         List<UserAchievementDO> userAchievements = userAchievementService.getUserAchievementPage(pageReqVO).getList();

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentAttendance/vo/StudentAttendancePageReqVO.java

@@ -26,6 +26,9 @@ public class StudentAttendancePageReqVO extends PageParam {
     @Schema(description = "工作间id", example = "114")
     private String deptId;
 
+    @Schema(description = "学生学号", example = "114")
+    private String userNumber;
+
     @Schema(description = "日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDate date;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentAttendance/vo/StudentAttendanceRespVO.java

@@ -26,6 +26,10 @@ public class StudentAttendanceRespVO {
     @ExcelProperty("学生名称")
     private String studentName;
 
+    @Schema(description = "学生学号", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @ExcelProperty("学生学号")
+    private String userNumber;
+
     @Schema(description = "工作间id", requiredMode = Schema.RequiredMode.REQUIRED, example = "22266")
     @ExcelProperty("工作间id")
     private String deptId;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/studentAttendance/StudentAttendanceMapper.java

@@ -40,10 +40,13 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
         queryWrapper.betweenIfPresent(StudentAttendanceDO::getClockInTime,reqVO.getCreateTime())
                 .selectAll(StudentAttendanceDO.class)
                 .selectAs(DeptDO::getName, StudentAttendanceDO::getDeptName)
-                .leftJoin(DeptDO.class, DeptDO::getId, AdminUserDO::getDeptId)
+                .selectAs(AdminUserDO::getUserNumber, StudentAttendanceDO::getUserNumber)
+                .leftJoin(DeptDO.class, DeptDO::getId, StudentAttendanceDO::getDeptId)
+                .leftJoin(AdminUserDO.class, AdminUserDO::getId, StudentAttendanceDO::getStudentId)
                 .eqIfExists(StudentAttendanceDO::getClockInStatus,"0")//正常
                 .eqIfExists(StudentAttendanceDO::getStudentId, reqVO.getStudentId())
                 .likeIfExists(StudentAttendanceDO::getStudentName, reqVO.getStudentName())
+                .likeIfExists(AdminUserDO::getUserNumber, reqVO.getUserNumber())//按学号查
                 .eqIfExists(StudentAttendanceDO::getDeptId, reqVO.getDeptId())
                 .eqIfExists(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
 
@@ -70,11 +73,14 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
         queryWrapperX.betweenIfPresent(StudentAttendanceDO::getClockInTime,reqVO.getCreateTime())
                 .selectAll(StudentAttendanceDO.class)
                 .selectAs(DeptDO::getName, StudentAttendanceDO::getDeptName)
-                .leftJoin(DeptDO.class, DeptDO::getId, AdminUserDO::getDeptId)
+                .selectAs(AdminUserDO::getUserNumber, StudentAttendanceDO::getUserNumber)
+                .leftJoin(DeptDO.class, DeptDO::getId, StudentAttendanceDO::getDeptId)
+                .leftJoin(AdminUserDO.class, AdminUserDO::getId, StudentAttendanceDO::getStudentId)
                 .likeIfExists(StudentAttendanceDO::getStudentName, reqVO.getStudentName())
+                .likeIfExists(AdminUserDO::getUserNumber, reqVO.getUserNumber())//按学号查
                 .eqIfExists(StudentAttendanceDO::getDeptId, reqVO.getDeptId())
                 .eqIfExists(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
-                //1未打卡，2警告
+                //1未打卡
                 .eqIfExists(StudentAttendanceDO::getClockInStatus,"1")
                 .orderByDesc(StudentAttendanceDO::getClockInTime);//未打卡