|
@@ -222,9 +222,9 @@ public class PersonDeviceFilterLogController {
|
|
|
DateTime startTime = new DateTime(sdf.parse(dateStr + " " + alarmConfig.getStartTime()));
|
|
|
DateTime endTime = new DateTime(sdf.parse(dateStr + " " + alarmConfig.getEndTime()));
|
|
|
|
|
|
- //todo 查询考勤表
|
|
|
- List<PersonInfo> unmeasuredList = workAttendanceService.queryUnAttendanceList(companyInfo.getCode() + "%", startTime.toDate(), endTime.toDate());
|
|
|
- //List<PersonInfo> unmeasuredList = personDeviceLogService.queryUnAttendanceList(companyInfo.getCode() + "%", startTime.toDate(), endTime.toDate());
|
|
|
+ //todo 查询考勤表由于是截止时间到后才能算缺卡,不够实时;还是改为查询测温记录
|
|
|
+ //List<PersonInfo> unmeasuredList = workAttendanceService.queryUnAttendanceList(companyInfo.getCode() + "%", startTime.toDate(), endTime.toDate());
|
|
|
+ List<PersonInfo> unmeasuredList = personDeviceLogService.queryUnAttendanceList(companyInfo.getCode() + "%", startTime.toDate(), endTime.toDate());
|
|
|
|
|
|
map.put("startTime", alarmConfig.getStartTime());
|
|
|
map.put("endTime", alarmConfig.getEndTime());
|