|
@@ -235,6 +235,21 @@ public class PersonDeviceFilterLogController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ else{
|
|
|
+ //没有设置考勤时间,则查全天
|
|
|
+ DateTime startTime = new DateTime(sdf.parse(dateStr + " 06:00:00"));
|
|
|
+ DateTime endTime = new DateTime(sdf.parse(dateStr + " 23:00:00"));
|
|
|
+
|
|
|
+ List<PersonInfo> unmeasuredList = personDeviceLogService.queryUnAttendanceList(companyInfo.getCode() + "%", startTime.toDate(), endTime.toDate());
|
|
|
+
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+
|
|
|
+ map.put("startTime", startTime);
|
|
|
+ map.put("endTime", endTime);
|
|
|
+ map.put("list", unmeasuredList);
|
|
|
+
|
|
|
+ mapList.add(map);
|
|
|
+ }
|
|
|
|
|
|
dataMap.put("list",mapList);
|
|
|
|