diff --git a/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java b/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java index f0060e5..d265bd5 100644 --- a/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java +++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java @@ -3118,13 +3118,18 @@ public class ClockInController { AttSchedule att = attsch.get(dk.getSort()-cr); if(att.getDajl().getId() != null && att.getDajl().getStatus() != 17 && att.getDajl().getId() != 888) { att.setIsdk(0); + + AttSchedule attw = attsch.get(dk.getSort()-1); + attw.setIsupdate(1); }else { AttSchedule att1 = attsch.get(dk.getSort()+cr); att1.setIsdk(0); + + AttSchedule attw = attsch.get(dk.getSort()+cr-1); + attw.setIsupdate(1); } - AttSchedule attw = attsch.get(dk.getSort()-1); - attw.setIsupdate(1); + }else { if(iscrdk) { AttSchedule attc = attsch.get(0); @@ -3147,12 +3152,16 @@ public class ClockInController { attc.setIsdk(0); }else { AttSchedule attc = attsch.get(cr); - if(attc.getDajl().getId() != null && attc.getDajl().getStatus() == 17 && attc.getDajl().getId() == 888) { - attc.getDajl().setId(null); - attc.getDajl().setSort(null); - attc.getDajl().setStatus(null); - } - attc.setIsdk(0); + Timestamp ag = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(attc.getTime()))); + if(ag.after(b)) { + if(attc.getDajl().getId() != null && attc.getDajl().getStatus() == 17 && attc.getDajl().getId() == 888) { + attc.getDajl().setId(null); + attc.getDajl().setSort(null); + attc.getDajl().setStatus(null); + } + attc.setIsdk(0); + } + } } @@ -3160,6 +3169,10 @@ public class ClockInController { } } + + //当全为缺卡时 + + }else { //休息的时候 List<AttSchedule> attsch_ = new ArrayList<AttSchedule>();