Merge remote-tracking branch 'origin/V1' into V1

common/src/main/java/com/jpsoft/smart/modules/business/service/impl/WorkAttendanceServiceImpl.java

@@ -159,15 +159,18 @@ public class WorkAttendanceServiceImpl implements WorkAttendanceService {
 						}
 					} else {
 						//todo 下班考勤
+
 						//早退
 						if (recordTime.compareTo(startTime)>0 && recordTime.compareTo(attendanceTime)<=0){
 							attendanceResult = WorkAttendance.LEAVE_EARLY;
 						}
 						else if(recordTime.compareTo(attendanceTime)>0 && recordTime.compareTo(endTime)<=0){
 							attendanceResult = WorkAttendance.SUCCESS;
+						}
 
-							//当天是否已经有该时段早退记录则删除，只保留最后一次正常下班打卡记录
-							List<WorkAttendance> workAttendances = workAttendanceDAO.findByPeriod(personId,alarmConfig.getId(),recordTime.toDate());
+						if(StringUtils.isNotEmpty(attendanceResult)) {
+							//当天是否已经有该时段记录,有则删除
+							List<WorkAttendance> workAttendances = workAttendanceDAO.findByPeriod(personId, alarmConfig.getId(), recordTime.toDate());
 
 							for (WorkAttendance workAttendance : workAttendances) {
 								workAttendance.setDelFlag(true);

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

@@ -162,16 +162,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);
                     }