Ver código fonte

统计报表调整显示本人当天所有考勤记录,便于调试。

zhengqiang 5 anos atrás
pai
commit
c56b85b841

+ 10 - 10
web/src/main/java/com/jpsoft/smart/modules/business/controller/WorkAttendanceController.java

@@ -142,16 +142,16 @@ public class WorkAttendanceController {
                 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(key2) && configMap.get(key2)){
-                                continue;
-                            }
-
-                            configMap.put(key2,workAttendance.getResult().equalsIgnoreCase(WorkAttendance.SUCCESS));
-                        }
+//                        String key2 = key + "-" + workAttendance.getAlarmConfigId();
+//
+//                        if (workAttendance.getClassifier().equals(1)){
+//                            //上班考勤,本轮考勤已打卡则不再记录后续打卡(以免算迟到)
+//                            if(configMap.containsKey(key2) && configMap.get(key2)){
+//                                continue;
+//                            }
+//
+//                            configMap.put(key2,workAttendance.getResult().equalsIgnoreCase(WorkAttendance.SUCCESS));
+//                        }
 
                         workAttendanceMap.get(key).add(workAttendance);
                     }