Merge branch 'pre'

src/main/java/com/xjrsoft/module/attendance/controller/StudentStatisticsController.java

@@ -327,7 +327,7 @@ public class StudentStatisticsController {
                 }
                 record.setLeaveCount(allLeaveCount);
 
-                Set<Long> collect = notStayMap.get(record.getId()).stream().map(StudentOutInRecordVo::getUserId).collect(Collectors.toSet());
+                List<Long> collect = notStayMap.get(record.getId()).stream().map(StudentOutInRecordVo::getUserId).collect(Collectors.toList());
 
                 record.setActualCount(collect.size());
                 record.setStudentCount(record.getStudentCount() * dayOfWeeks.size() * 3);

src/main/java/com/xjrsoft/module/job/AttendanceMessageTask.java

@@ -160,7 +160,7 @@ public class AttendanceMessageTask {
                 characterKey = "character_string18";
                 //获取最近的时间
                 recentlyTime = getRecentlyTime(ruleDetails, now);
-                if(recentlyTime.getHour() != now.getHour() && recentlyTime.getMinute() != now.getMinute()){
+                if(!recentlyTime.isEqual(now)){
                     log.info("未到时间，不需要提醒");
                     continue;
                 }
@@ -168,7 +168,7 @@ public class AttendanceMessageTask {
                 wechatTemplate = weChatUtil.getAttendanceMsgAbsenceTemplate();
                 recentlyTime = getRecentlyOverTime(ruleDetails, now);
                 characterKey = "character_string36";
-                if(recentlyTime.getHour() != now.getHour() && recentlyTime.getMinute() != now.getMinute()){
+                if(!recentlyTime.isEqual(now)){
                     log.info("未到时间，不需要提醒");
                     continue;
                 }