|
@@ -175,7 +175,9 @@ public class UnmeasureTemperatureAlarmTask {
|
|
|
if (weekdays.indexOf(String.valueOf(weekday)) != -1) {
|
|
|
if (now.compareTo(alarmTime)>=0 && now.compareTo(alarmTime.plusMinutes(intervalMinute))<0) {
|
|
|
//todo 通知个人
|
|
|
- noticePerson(alarmConfig,startTime,attendanceTime,endTime);
|
|
|
+ if(alarmConfig.getNeedMeasureTemperature()){
|
|
|
+ noticePerson(alarmConfig,startTime,attendanceTime,endTime);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//todo 考勤时间已到
|
|
@@ -183,7 +185,9 @@ public class UnmeasureTemperatureAlarmTask {
|
|
|
//todo 未测量人通知管理人员
|
|
|
if(alarmConfig.getClassifier().equals(1)){
|
|
|
//上班
|
|
|
- noticeManager(alarmConfig,startTime,attendanceTime);
|
|
|
+ if(alarmConfig.getNeedMeasureTemperature()) {
|
|
|
+ noticeManager(alarmConfig, startTime, attendanceTime);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//todo 记录考勤
|
|
@@ -201,7 +205,9 @@ public class UnmeasureTemperatureAlarmTask {
|
|
|
if (now.compareTo(endTime)>=0 && now.compareTo(endTime.plusMinutes(intervalMinute))<0) {
|
|
|
if(alarmConfig.getClassifier().equals(2)){
|
|
|
//下班
|
|
|
- noticeManager(alarmConfig,attendanceTime,endTime);
|
|
|
+ if(alarmConfig.getNeedMeasureTemperature()) {
|
|
|
+ noticeManager(alarmConfig, attendanceTime, endTime);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//todo 记录考勤
|
|
@@ -214,7 +220,7 @@ public class UnmeasureTemperatureAlarmTask {
|
|
|
recordAttendance(alarmConfig, attendanceTime.toDate(), endTime.toDate(),WorkAttendance.SUCCESS);
|
|
|
}
|
|
|
|
|
|
- //未到开始截止时间内打开算旷工
|
|
|
+ //未在开始截止时间内打卡算旷工
|
|
|
recordUnAttendance(alarmConfig,startTime.toDate(),attendanceTime.toDate(),endTime.toDate(),WorkAttendance.MISSING);
|
|
|
}
|
|
|
}
|