|
@@ -138,18 +138,18 @@ public class WorkAttendanceController {
|
|
|
List<WorkAttendance> workAttendanceList = workAttendanceService.findByPersonIdAndDate(personInfo.getId(),startDate,endDate);
|
|
|
|
|
|
Map<String,Boolean> configMap = new HashMap<>();
|
|
|
-
|
|
|
for (WorkAttendance workAttendance : workAttendanceList) {
|
|
|
if(workAttendance.getRecordTime()!=null) {
|
|
|
String key = sdf.format(workAttendance.getRecordTime());
|
|
|
+ String key2 = key + "-" + workAttendance.getAlarmConfigId();
|
|
|
|
|
|
if (workAttendance.getClassifier().equals(1)){
|
|
|
//上班考勤,本轮考勤已打卡则不再记录后续打卡(以免算迟到)
|
|
|
- if(configMap.containsKey(workAttendance.getAlarmConfigId()) && configMap.get(workAttendance.getAlarmConfigId())){
|
|
|
+ if(configMap.containsKey(key2) && configMap.get(key2)){
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- configMap.put(workAttendance.getAlarmConfigId(),workAttendance.getResult().equalsIgnoreCase(WorkAttendance.SUCCESS));
|
|
|
+ configMap.put(key2,workAttendance.getResult().equalsIgnoreCase(WorkAttendance.SUCCESS));
|
|
|
}
|
|
|
|
|
|
workAttendanceMap.get(key).add(workAttendance);
|