yzx преди 8 месеца
родител
ревизия
f2c9f1cbcd

+ 0 - 1
yudao-module-md/yudao-module-md-biz/src/main/java/cn/iocoder/yudao/module/md/controller/admin/vo/attendanceImportExcelVO.java

@@ -24,5 +24,4 @@ public class attendanceImportExcelVO {
     @ExcelProperty("学号")
     private String employeeNo;
 
-
 }

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

@@ -99,12 +99,13 @@ public class DeptController {
     @Operation(summary = "获得登录人员工作间信息")
     @PreAuthorize("@ss.hasPermission('system:dept:selfQuery')")
     public CommonResult<DeptRespVO> getUserDept() {
+        // TODO 你这里不是用了部门信息查询吗哈哈哈哈,user那些方法里怎么不用,还写了sql
         // 获取部门信息
         DeptDO dept = deptService.getUserDept();
         if (dept == null) {
             return null;
         }
-
+        // TODO 有一点小问题,工作间负责人(老师)可能是多个,这里是只能存一个了
         // 获取负责人用户信息
         Long leaderUserId = dept.getLeaderUserId();
         AdminUserDO user = (leaderUserId != null) ? adminUserService.getUser(leaderUserId) : null;
@@ -134,7 +135,7 @@ public class DeptController {
                 }
             }
         }
-
+        // TODO 人数可以直接使用sql 统计,成果不是也存deptId吗,可以直接根据部门id来查出所有部门下面的成果
         newDept.setSupervisorNum(String.valueOf(supervisor.size()));
         newDept.setStudentNum(String.valueOf(student.size()));
         newDept.setUserAchievements(userAchievements);

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

@@ -65,8 +65,8 @@ public class StudentAttendanceController {
     public void checkAttendanceFirst() {
         List<AdminUserDO> userList = adminUserService.getAllUserList();
         LocalDate localDate = LocalDate.now();
-
-        for (AdminUserDO user : userList) {
+        // TODO 也不需要再查一下所有用户吧,直接StudentAttendanceDO里面分类就好了,
+         for (AdminUserDO user : userList) {
             List<StudentAttendanceDO> result = studentAttendanceService.getStudentAttendanceDay(user.getUserNumber(),localDate);
             if ("1".equals(user.getUserType())) {//只对在校生
                 if (result != null && result.size() == 0) { //

+ 3 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/UserAchievementController.java

@@ -77,7 +77,7 @@ public class UserAchievementController {
         userAchievementService.updateUserAchievement(updateReqVO);
         return success(true);
     }
-
+    // TODO 这里的两个方法不是一样的吗?
     @PutMapping("/selfUpdate")
     @Operation(summary = "更新自己的成果")
     @PreAuthorize("@ss.hasPermission('system:user-achievement:selfUpdate')")
@@ -108,6 +108,7 @@ public class UserAchievementController {
     @Operation(summary = "获得工作间下成员成果分页")
     @PreAuthorize("@ss.hasPermission('system:user-achievement:query')")
     public CommonResult<PageResult<UserAchievementRespVO>> getUserAchievementPage(@Valid UserAchievementPageReqVO pageReqVO) {
+        // TODO 应该依托于这个原生成的方法,对搜索条件进行修改,进而实现各类查询,简单且不用书写太多
         PageResult<UserAchievementDO>pageResult = userAchievementService.getUserAchievementPage(pageReqVO);
 
         System.out.println(pageResult);
@@ -158,6 +159,7 @@ public class UserAchievementController {
     @Operation(summary = "获得某个用户的成果分页")
     @PreAuthorize("@ss.hasPermission('system:user-achievement:oneUserQuery')")
     public CommonResult<PageResult<UserAchievementRespVO>> getOneUserAchievementPage(Integer userId) {
+        //TODO 这里没分页啊,  也不用单独写一个方法,在page里面传入userId即可
         PageResult<UserAchievementDO>pageResult = userAchievementService.selectUserAchievementPageById(userId);
 
         return success(BeanUtils.toBean(pageResult, UserAchievementRespVO.class));

+ 1 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userPhotoGroup/UserPhotoGroupController.java

@@ -34,7 +34,7 @@ import cn.iocoder.yudao.module.system.service.userPhotoGroup.UserPhotoGroupServi
 @RequestMapping("/system/user-photo-group")
 @Validated
 public class UserPhotoGroupController {
-
+    //TODO 这个类是不是没用上啊
     @Resource
     private UserPhotoGroupService userPhotoGroupService;
 

+ 1 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userPhotos/UserPhotosController.java

@@ -34,7 +34,7 @@ import cn.iocoder.yudao.module.system.service.userPhotos.UserPhotosService;
 @RequestMapping("/system/user-photos")
 @Validated
 public class UserPhotosController {
-
+    // TODO 这里是不是也没用上
     @Resource
     private UserPhotosService userPhotosService;
 

+ 10 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/userAchievement/UserAchievementMapper.java

@@ -24,6 +24,8 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
     default PageResult<UserAchievementDO> selectPage(UserAchievementPageReqVO reqVO) {
         Long loginID = SecurityFrameworkUtils.getLoginUserId(); //
         System.out.println(loginID);
+        // TODO 和下面同理
+
         return selectPage(reqVO, new LambdaQueryWrapperX<UserAchievementDO>()
                 .eqIfPresent(UserAchievementDO::getUserId, reqVO.getUserId())
                 .likeIfPresent(UserAchievementDO::getAchievementName, reqVO.getAchievementName())
@@ -38,6 +40,12 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
     //导师
     default PageResult<UserAchievementDO> selectTeacherPage(UserAchievementPageReqVO reqVO) {
         Long loginID = SecurityFrameworkUtils.getLoginUserId(); //
+        // TODO 逻辑还是稍微有点混乱,UserAchievementPageReqVO里面可以直接加入deptId这个参数,
+        //  这样就不需要再另外查询了,就是成果表中加入一个dept_id字段,然后查询的时候直接用这个字段来查询(看了一下,发现你是存了的,为啥不直接用)
+        //  如果需要查询,也不建议用下面这种,如果dept_id出现问题应该会报错
+        //  而且我看这个逻辑好像没把老师筛选出来
+
+
         return selectPage(reqVO, new LambdaQueryWrapperX<UserAchievementDO>()
                 .eqIfPresent(UserAchievementDO::getUserId, reqVO.getUserId())
                 .likeIfPresent(UserAchievementDO::getAchievementName, reqVO.getAchievementName())
@@ -48,6 +56,7 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 //找到这个工作室下的人员成果
                 .inSql(UserAchievementDO::getDeptId,String.format("SELECT dept_id FROM system_users WHERE id = %d", loginID))
                 // 找到这个工作室下的人员成果,3导师
+                // TODO 这里的筛选应该是无效筛选,没有达成目的
                 .inSql(UserAchievementDO::getDeptId,
                         String.format("SELECT dept_id FROM system_users WHERE id = %d AND user_type = 3", loginID))
                 .orderByDesc(UserAchievementDO::getCreateTime));
@@ -82,6 +91,7 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 .betweenIfPresent(UserAchievementDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(UserAchievementDO::getDetail, reqVO.getDetail())
                 //找到这个自己的成果
+                //TODO 怎么还插入了一段原生sql哈哈哈哈,直接.eqIfPresent(UserAchievementDO::getUserId, loginID)即可
                 .inSql(UserAchievementDO::getUserId,String.format("SELECT id FROM system_users WHERE id = %d", loginID))
                 .orderByDesc(UserAchievementDO::getCreateTime));
     }