11.18

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

@@ -362,4 +362,35 @@ public class StudentAttendanceController {
         return success(result);
     }
 
+
+    @GetMapping("/dayAttendanceCount")
+    @Operation(summary = "日出勤统计")
+    public CommonResult<weekendAttendanceResVO> getDayAttendance () {
+        List<AdminUserDO>studentList = adminUserService.getAllUserList();
+        LocalDate today = LocalDate.now();
+
+        StudentAttendancePageReqVO reqVO =new StudentAttendancePageReqVO();
+        reqVO.setDate(today);
+        List<AdminUserDO> errorList = new ArrayList<>();
+        List<AdminUserDO> normalList = new ArrayList<>();
+        for (AdminUserDO student : studentList) {
+            if ("1".equals(student.getUserType())) {
+                reqVO.setUserNumber(student.getUserNumber());
+                reqVO.setClockInStatus("1");//找他未打卡的
+                List<StudentAttendanceDO> attendanceList = studentAttendanceService.getStudentAttendanceList(reqVO);
+                if (!attendanceList.isEmpty()) {
+                    errorList.add(student);
+                } else {
+                    normalList.add(student);
+                }
+            }
+        }
+        Integer errorNum =errorList.size();
+        Integer normalNum =normalList.size();
+        weekendAttendanceResVO result = new weekendAttendanceResVO();
+        result.setErrorNum(errorNum);
+        result.setNormalNum(normalNum);
+        return success(result);
+    }
+
 }

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

@@ -116,12 +116,8 @@ public class AdminUserServiceImpl implements AdminUserService {
         user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启
 
         if ("2".equals(createReqVO.getUserType())){//是毕业生
-            if (createReqVO.getPassword()==null){
-                createReqVO.setPassword(encodePassword("123456"));//设置毕业生密码
-            }
-            if (createReqVO.getUsername()==null){
-                createReqVO.setUsername(String.valueOf((int) (Math.random() * 900000000) + 100000000));//设置毕业生账号
-            }
+            createReqVO.setPassword(encodePassword("123456"));//设置毕业生密码
+            createReqVO.setUsername("graduate" + String.valueOf((int) (Math.random() * 900000) + 100000));//毕业生账号
         }
 
         if (createReqVO.getPassword()!=null) {
@@ -132,11 +128,13 @@ public class AdminUserServiceImpl implements AdminUserService {
         if ("3".equals(createReqVO.getUserType())){//是导师直接添加为负责人
             //上面已经验证过部门存在了
             DeptDO dept = deptService.getDept(createReqVO.getDeptId());
-            DeptSaveReqVO newDept =BeanUtils.toBean(dept,DeptSaveReqVO.class);
-            List<Long> leaderIdList =  newDept.getLeaderUserId();
-            leaderIdList.add(user.getId());
-            newDept.setLeaderUserId(leaderIdList);
-            deptService.updateDept(newDept);
+            if (dept!=null) {
+                DeptSaveReqVO newDept = BeanUtils.toBean(dept, DeptSaveReqVO.class);
+                List<Long> leaderIdList = newDept.getLeaderUserId();
+                leaderIdList.add(user.getId());
+                newDept.setLeaderUserId(leaderIdList);
+                deptService.updateDept(newDept);
+            }
         }
 
         // 2.2 插入关联岗位
@@ -185,18 +183,20 @@ public class AdminUserServiceImpl implements AdminUserService {
 
             //添加部门负责人
             DeptDO dept = deptService.getDept(updateReqVO.getDeptId());
-            DeptSaveReqVO newDept =BeanUtils.toBean(dept,DeptSaveReqVO.class);
-            List<Long> leaderIdList = newDept.getLeaderUserId();
-            if (leaderIdList == null) {
-                leaderIdList = new ArrayList<>();
-                leaderIdList.add(updateReqVO.getId());
-            }else{
-                if(!leaderIdList.contains(updateReqVO.getId())){
+            if (dept!=null) {
+                DeptSaveReqVO newDept = BeanUtils.toBean(dept, DeptSaveReqVO.class);
+                List<Long> leaderIdList = newDept.getLeaderUserId();
+                if (leaderIdList == null) {
+                    leaderIdList = new ArrayList<>();
                     leaderIdList.add(updateReqVO.getId());
+                } else {
+                    if (!leaderIdList.contains(updateReqVO.getId())) {
+                        leaderIdList.add(updateReqVO.getId());
+                    }
                 }
+                newDept.setLeaderUserId(leaderIdList);
+                deptService.updateDept(newDept);
             }
-            newDept.setLeaderUserId(leaderIdList);
-            deptService.updateDept(newDept);
         }
         userMapper.updateById(updateObj);
         // 2.2 更新岗位