1.2日，日志输出和去除了excel里面的请假

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

@@ -175,7 +175,7 @@ public final class EventSearch {
                     employeeNo = String.valueOf(struAcsEventCfg.struAcsEventInfo.dwEmployeeNo);
                 }
 
-                attendance.setClockInTime(parsedTime);//打卡时间
+                //设置信息
                 attendance.setDate(date);//打卡日期
                 attendance.setUserNumber(employeeNo);//学号
                 if (photoUrl != null) {
@@ -200,8 +200,8 @@ public final class EventSearch {
                                     if ("1".equals(re.getClockInStatus())) {//找到未打卡的
                                         re.setClockInStatus("0");//变成正常
                                         re.setClockInTime(parsedTime);//更新打卡时间
-                                        re.setCreateTime(parsedTime);//更新时间
-                                        re.setUpdateTime(parsedTime);
+                                        re.setCreateTime(parsedTime);
+                                        re.setUpdateTime(parsedTime);//更新时间
                                         if (photoUrl != null) {
                                             re.setPhoto(photoUrl); //
                                         }
@@ -214,6 +214,7 @@ public final class EventSearch {
                                     attendance.setDeptId(user.getDeptId()); // 工作间id
                                     attendance.setSupervisorId(user.getSupervisorId()); // 导师id
                                     attendance.setClockInStatus(transformClockStatus(parsedTime)); // 打卡状态
+                                    attendance.setClockInTime(parsedTime);//打卡时间
                                     attendance.setCreateTime(parsedTime);
                                     attendance.setUpdateTime(parsedTime);
                                     studentAttendance.add(attendance);
@@ -225,6 +226,7 @@ public final class EventSearch {
                                 attendance.setDeptId(user.getDeptId()); // 工作间id
                                 attendance.setSupervisorId(user.getSupervisorId()); // 导师id
                                 attendance.setClockInStatus(transformClockStatus(parsedTime)); // 打卡状态
+                                attendance.setClockInTime(parsedTime);//打卡时间
                                 attendance.setCreateTime(parsedTime);
                                 attendance.setUpdateTime(parsedTime);
                                 studentAttendance.add(attendance);

yudao-module-md/yudao-module-md-biz/src/main/java/cn/iocoder/yudao/module/md/service/AcsService.java

@@ -73,7 +73,8 @@ public class AcsService {
         }
 
         hCNetSDK.NET_DVR_Init();
-        hCNetSDK.NET_DVR_SetLogToFile(3, "./sdklog", false);
+        //不输出日志
+//        hCNetSDK.NET_DVR_SetLogToFile(3, "./sdklog", false);
 
         lUserID = loginDevice(DEVICE_IP, DEVICE_PORT, DEVICE_USERNAME, DEVICE_PASSWORD);
         if (lUserID == -1) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java

@@ -160,10 +160,10 @@ public class MailTemplateController {
                         studentAttendanceService.getStudentAttendanceErrorListForTeacher(pageReqVO.setSupervisorId(getLoginUserId())),
                         StudentAttendanceSupervisorTemplateVO.class
                 );
-                List<StudentAttendanceSupervisorTemplateVO> excusedList = BeanUtils.toBean(
-                        studentAttendanceService.getStudentAttendanceExcusedListForTeacher(pageReqVO.setSupervisorId(getLoginUserId())),
-                        StudentAttendanceSupervisorTemplateVO.class
-                );
+//                List<StudentAttendanceSupervisorTemplateVO> excusedList = BeanUtils.toBean(
+//                        studentAttendanceService.getStudentAttendanceExcusedListForTeacher(pageReqVO.setSupervisorId(getLoginUserId())),
+//                        StudentAttendanceSupervisorTemplateVO.class
+//                );
                 // 创建 ByteArrayOutputStream 用来存储 Excel 文件数据
                 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
 
@@ -171,12 +171,12 @@ public class MailTemplateController {
                 try (ExcelWriter excelWriter = EasyExcel.write(byteArrayOutputStream, StudentAttendanceSupervisorTemplateVO.class).build()) {
                     WriteSheet writeSheetNormal = EasyExcel.writerSheet("正常打卡信息").build();
                     WriteSheet writeSheetError = EasyExcel.writerSheet("未打卡信息").build();
-                    WriteSheet writeSheetExcused = EasyExcel.writerSheet("请假信息").build();
+//                    WriteSheet writeSheetExcused = EasyExcel.writerSheet("请假信息").build();
 
                     // 将各个 List 数据写入不同的 Sheet 中
                     excelWriter.write(normalList, writeSheetNormal);
                     excelWriter.write(errorList, writeSheetError);
-                    excelWriter.write(excusedList, writeSheetExcused);
+//                    excelWriter.write(excusedList, writeSheetExcused);
                 }
 
                 // 创建附件 Map
@@ -229,14 +229,14 @@ public class MailTemplateController {
                         })
                         .collect(Collectors.toList());
 
-                List<StudentAttendanceCollegeTemplateVO> excusedList = studentAttendanceService.getStudentAttendanceExcusedListForTeacher(attendanceReqVO)
-                        .stream()
-                        .map(studentAttendance -> {
-                            StudentAttendanceCollegeTemplateVO vo = BeanUtils.toBean(studentAttendance, StudentAttendanceCollegeTemplateVO.class);
-                            vo.setClockInTime("请假");
-                            return vo;
-                        })
-                        .collect(Collectors.toList());
+//                List<StudentAttendanceCollegeTemplateVO> excusedList = studentAttendanceService.getStudentAttendanceExcusedListForTeacher(attendanceReqVO)
+//                        .stream()
+//                        .map(studentAttendance -> {
+//                            StudentAttendanceCollegeTemplateVO vo = BeanUtils.toBean(studentAttendance, StudentAttendanceCollegeTemplateVO.class);
+//                            vo.setClockInTime("请假");
+//                            return vo;
+//                        })
+//                        .collect(Collectors.toList());
 
                 // 输出 Excel
                 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -249,7 +249,7 @@ public class MailTemplateController {
 
                     excelWriter.write(normalList, writeSheetNormal);
                     excelWriter.write(errorList, writeSheetError);
-                    excelWriter.write(excusedList, writeSheetExcused);
+//                    excelWriter.write(excusedList, writeSheetExcused);
                 }
 
                 // 附件
@@ -468,14 +468,14 @@ public class MailTemplateController {
                         })
                         .collect(Collectors.toList());
 
-                List<StudentAttendanceSupervisorTemplateVO> excusedList = studentAttendanceService.getStudentAttendanceExcusedListForTeacher(pageReqVO)
-                        .stream()
-                        .map(studentAttendance -> {
-                            StudentAttendanceSupervisorTemplateVO vo = BeanUtils.toBean(studentAttendance, StudentAttendanceSupervisorTemplateVO.class);
-                            vo.setClockInTime("请假");
-                            return vo;
-                        })
-                        .collect(Collectors.toList());
+//                List<StudentAttendanceSupervisorTemplateVO> excusedList = studentAttendanceService.getStudentAttendanceExcusedListForTeacher(pageReqVO)
+//                        .stream()
+//                        .map(studentAttendance -> {
+//                            StudentAttendanceSupervisorTemplateVO vo = BeanUtils.toBean(studentAttendance, StudentAttendanceSupervisorTemplateVO.class);
+//                            vo.setClockInTime("请假");
+//                            return vo;
+//                        })
+//                        .collect(Collectors.toList());
 
                 // 创建 ByteArrayOutputStream 用来存储 Excel 文件数据
                 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -485,11 +485,11 @@ public class MailTemplateController {
 
                     WriteSheet writeSheetNormal =EasyExcel.writerSheet("正常打卡信息").build();
                     WriteSheet writeSheetError =EasyExcel.writerSheet("未打卡信息").build();
-                    WriteSheet writeSheetExcused =EasyExcel.writerSheet("请假信息").build();
+//                    WriteSheet writeSheetExcused =EasyExcel.writerSheet("请假信息").build();
 
                     excelWriter.write(normalList, writeSheetNormal);
                     excelWriter.write(errorList, writeSheetError);
-                    excelWriter.write(excusedList, writeSheetExcused);
+//                    excelWriter.write(excusedList, writeSheetExcused);
                 }
 
                 // 创建附件 Map
@@ -542,14 +542,14 @@ public class MailTemplateController {
                         })
                         .collect(Collectors.toList());
 
-                List<StudentAttendanceCollegeTemplateVO> excusedList = studentAttendanceService.getStudentAttendanceExcusedListForTeacher(attendanceReqVO)
-                        .stream()
-                        .map(studentAttendance -> {
-                            StudentAttendanceCollegeTemplateVO vo = BeanUtils.toBean(studentAttendance, StudentAttendanceCollegeTemplateVO.class);
-                            vo.setClockInTime("请假");
-                            return vo;
-                        })
-                        .collect(Collectors.toList());
+//                List<StudentAttendanceCollegeTemplateVO> excusedList = studentAttendanceService.getStudentAttendanceExcusedListForTeacher(attendanceReqVO)
+//                        .stream()
+//                        .map(studentAttendance -> {
+//                            StudentAttendanceCollegeTemplateVO vo = BeanUtils.toBean(studentAttendance, StudentAttendanceCollegeTemplateVO.class);
+//                            vo.setClockInTime("请假");
+//                            return vo;
+//                        })
+//                        .collect(Collectors.toList());
 
                 // 输出 Excel
                 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -558,12 +558,12 @@ public class MailTemplateController {
                 try (ExcelWriter excelWriter = EasyExcel.write(byteArrayOutputStream, StudentAttendanceCollegeTemplateVO.class).build()) {
                     WriteSheet writeSheetNormal = EasyExcel.writerSheet("正常打卡信息").build();
                     WriteSheet writeSheetError = EasyExcel.writerSheet("未打卡信息").build();
-                    WriteSheet writeSheetExcused = EasyExcel.writerSheet("请假信息").build();
+//                    WriteSheet writeSheetExcused = EasyExcel.writerSheet("请假信息").build();
 
                     // 将各个 List 数据写入不同的 Sheet 中
                     excelWriter.write(normalList, writeSheetNormal);
                     excelWriter.write(errorList, writeSheetError);
-                    excelWriter.write(excusedList, writeSheetExcused);
+//                    excelWriter.write(excusedList, writeSheetExcused);
                 }
 
                 Map<String, InputStream> attachments = new HashMap<>();

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

@@ -143,6 +143,7 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
         return selectList(queryWrapper);
     }
 
+    //全部正常考勤记录（推送邮箱的时候用了）
     default List<StudentAttendanceDO> selectListForTeacher(StudentAttendancePageReqVO reqVO) {
          // 创建查询包装器
         MPJLambdaWrapperX<StudentAttendanceDO> queryWrapper = new MPJLambdaWrapperX<>();
@@ -168,7 +169,7 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
         return selectList(queryWrapper);
     }
 
-    //全部异常的异常考勤记录
+    //按登录人员显示全部异常的异常考勤记录分页
     default PageResult<StudentAttendanceDO> selectErrorPage(StudentAttendancePageReqVO reqVO, Set<Long> roleIds,Long loginId) {
         Long dept_id = SecurityFrameworkUtils.getLoginUserDeptId();
 
@@ -206,7 +207,7 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
 
          return selectPage(reqVO,queryWrapperX);
     }
-    //全部异常的异常考勤记录
+    //按登录人员显示全部异常的异常考勤记录列表
     default List<StudentAttendanceDO> selectErrorList(StudentAttendancePageReqVO reqVO, Set<Long> roleIds,Long loginId) {
         Long dept_id = SecurityFrameworkUtils.getLoginUserDeptId();
 
@@ -243,7 +244,8 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
         }
         return selectList(queryWrapperX);
     }
-    //全部异常的异常考勤记录
+
+    //全部异常的考勤记录（推送邮箱的时候用了）
     default List<StudentAttendanceDO> selectErrorListForTeacher(StudentAttendancePageReqVO reqVO) {
 
         MPJLambdaWrapperX<StudentAttendanceDO> queryWrapperX =new MPJLambdaWrapperX<>();
@@ -266,6 +268,7 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
 
         return selectList(queryWrapperX);
     }
+
     //根据登录人员不同显示全部请假的考勤记录
     default PageResult<StudentAttendanceDO> selectExcusedPage(StudentAttendancePageReqVO reqVO, Set<Long> roleIds,Long loginId) {
         Long dept_id = SecurityFrameworkUtils.getLoginUserDeptId();
@@ -348,6 +351,7 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
         return selectList(queryWrapper);
     }
 
+    //全部请假考勤记录（推送邮箱的时候用了）
     default List<StudentAttendanceDO> selectExcusedListForTeacher(StudentAttendancePageReqVO reqVO) {
 
         MPJLambdaWrapperX<StudentAttendanceDO> queryWrapperX =new MPJLambdaWrapperX<>();