11.1

yudao-module-md/yudao-module-md-biz/src/main/java/Acs/EventSearch.java

@@ -169,12 +169,13 @@ public final class EventSearch {
                     System.out.println("该打卡记录已存在");
                 }
                  //检查并更新未打卡
+                if (user!=null) {
                     LocalDate localDate = LocalDate.now();
-                    List<StudentAttendanceDO> result = studentAttendanceService.getStudentAttendanceDay(user.getUserNumber(),localDate);//找到这天的打卡记录
+                    List<StudentAttendanceDO> result = studentAttendanceService.getStudentAttendanceDay(user.getUserNumber(), localDate);//找到这天的打卡记录
                     if ("1".equals(user.getUserType())) {//只对在校生
-                       if (!result.isEmpty() && result.size()==1){//
-                           StudentAttendanceDO re = result.get(0);
-                            if ("1".equals(re.getClockInStatus())&&re.getClockInTime()==null) {//找到未打卡的
+                        if (!result.isEmpty() && result.size() == 1) {//
+                            StudentAttendanceDO re = result.get(0);
+                            if ("1".equals(re.getClockInStatus())) {//找到未打卡的
                                 re.setClockInStatus("0");//变成正常
                                 re.setClockInTime(parsedTime);//更新打卡时间
                                 attendance.setCreateTime(parsedTime);//更新时间
@@ -183,6 +184,7 @@ public final class EventSearch {
                             }
                         }
                     }
+                }
                 studentAttendance.add(attendance);
 
                 //人脸图片保存(没用)

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

@@ -42,6 +42,10 @@ public class DeptRespVO {
     @Schema(description = "工作间地址")
     private String address;
 
+    @Schema(description = "工作间简介")
+    private String description;
+
+
     @Schema(description = "导师人数")
     private String supervisorNum;
 

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

@@ -50,4 +50,7 @@ public class DeptSaveReqVO {
     @Schema(description = "地址", example = "桂林理工大学")
     private String address;
 
+    @Schema(description = "简介")
+    private String description;
+
 }

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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.studentAttendance;
 
+import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
@@ -63,7 +64,9 @@ public class StudentAttendanceController {
     }
 
     public void checkAttendanceFirst() {
-        List<AdminUserDO> userList = adminUserService.getAllUserList();
+        UserPageReqVO reqVO =new UserPageReqVO();
+        reqVO.setUserNumber("1");//学生
+        List<AdminUserDO> userList = adminUserService.getUserPage(reqVO).getList();
         LocalDate localDate = LocalDate.now();
 
          for (AdminUserDO user : userList) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -191,7 +191,7 @@ public class UserController {
 
     //lsq
     @GetMapping("/DeptStudentPage")
-    @Operation(summary = "获得工作间学生分页列表")
+    @Operation(summary = "获得工作间学生分页列表")//学院，导师
     @PreAuthorize("@ss.hasPermission('system:workroom:studentlist')")
     public CommonResult<PageResult<UserRespVO>> getDeptStudentPage(@Valid UserPageReqVO pageReqVO) {
         // 获得用户分页列表

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java

@@ -74,4 +74,10 @@ public class DeptDO extends TenantBaseDO {
      */
     private String address;
 
+    /**
+     * 工作间简介
+     */
+    private String description;
+
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java

@@ -139,6 +139,10 @@ public class AdminUserDO extends TenantBaseDO {
     //0已导入，1未导入
     @TableField(exist = false)
     private Long photoIsExist;
+
+    //0已达成，1未达成
+    @TableField(exist = false)
+    private Long isGraduate;
     
 
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -42,6 +42,8 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     default PageResult<AdminUserDO> selectPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
         return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
                 .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
+                .likeIfPresent(AdminUserDO::getUserNumber,reqVO.getUserNumber())//按学号
+                .eqIfPresent(AdminUserDO::getUserType,reqVO.getUserType())//用户类型
                 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
@@ -73,17 +75,13 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
-                .inSql(AdminUserDO::getId, "SELECT id FROM system_users WHERE user_type IN (1,2)")
+                .inSql(AdminUserDO::getId, "SELECT id FROM system_users WHERE user_type =1")
                 .orderByDesc(AdminUserDO::getId);
 
         if (roleIds.contains(113L)){//如果是教师,只找导师是登录的
             queryWrapperX.eqIfPresent(AdminUserDO::getSupervisorId,loginId);
         }
         PageResult<AdminUserDO> result = selectPage(reqVO,queryWrapperX);
-        // 遍历结果集，设置 photoIsExist
-        for (AdminUserDO user : result.getList()) {
-            user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
-        }
         return result;
     }
 
@@ -105,7 +103,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .orderByDesc(AdminUserDO::getId));
     }
 
-    // lsq  查工作间下的学生 1在校生，2毕业生
+    // lsq  查工作间下的学生 1在校生
     default PageResult<AdminUserDO> selectDeptStudentPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
         Long loginID = SecurityFrameworkUtils.getLoginUserId();
         System.out.println(loginID);
@@ -118,15 +116,10 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
-                .inSql(AdminUserDO::getId, "SELECT id FROM system_users WHERE user_type IN (1,2)")
+                .inSql(AdminUserDO::getId, "SELECT id FROM system_users WHERE user_type = 1")
                 .inSql(AdminUserDO::getDeptId, String.format("SELECT dept_id FROM system_users WHERE id = %d", loginID))
                 .orderByDesc(AdminUserDO::getId));
 
-        // 遍历结果集，设置 photoIsExist
-        for (AdminUserDO user : result.getList()) {
-            user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
-        }
-
         return result;
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -276,10 +276,17 @@ public class AdminUserServiceImpl implements AdminUserService {
     //<>
     //lsq 学生
     @Override
-    public PageResult<AdminUserDO> getUserPage1(UserPageReqVO reqVO) {
+    public PageResult<AdminUserDO> getUserPage1(UserPageReqVO reqVO) {//(学院)
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
-        return userMapper.selectPage1(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,loginId);
+        PageResult<AdminUserDO> result =userMapper.selectPage1(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,loginId);
+        // 遍历结果集，设置 photoIsExist
+        for (AdminUserDO user : result.getList()) {
+            user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
+            user.setIsGraduate(vilidateIsGraduate(user));
+        }
+        System.out.println(result);
+        return result;
     }
     //lsq 老师
     @Override
@@ -292,10 +299,16 @@ public class AdminUserServiceImpl implements AdminUserService {
     public PageResult<AdminUserDO> getDeptTeacherPage(UserPageReqVO reqVO) {
         return userMapper.selectDeptTeacherPage(reqVO, getDeptCondition(reqVO.getDeptId()));
     }
-    //查询工作间下的学生
+    //查询工作间下的学生（导师）
     @Override
     public PageResult<AdminUserDO> getDeptStudentPage(UserPageReqVO reqVO) {
-        return userMapper.selectDeptStudentPage(reqVO, getDeptCondition(reqVO.getDeptId()));
+        PageResult<AdminUserDO> result = userMapper.selectDeptStudentPage(reqVO, getDeptCondition(reqVO.getDeptId()));
+        for (AdminUserDO user : result.getList()) {
+            user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
+            user.setIsGraduate(vilidateIsGraduate(user));
+        }
+        System.out.println(result);
+        return result;
     }
     //查询工作间下的人员
     @Override
@@ -649,5 +662,12 @@ public class AdminUserServiceImpl implements AdminUserService {
         return null;
     }
 
+    /**
+     * 检验是否达成毕业条件
+     */
+    private Long vilidateIsGraduate(AdminUserDO user) {
+        return 0L;
+    }
+
 }