Skip to content

8
8timerapiv200
Commit 62a90772 by leialin
Options

Merge branch 'lal' into 'develop' 

提交

See merge request 8timerv2/8timerapiv200!439
parents 86d2fdb4 3b1de114
Showing with 21 additions and 8 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -3118,13 +3118,18 @@ public class ClockInController { ...@@ -3118,13 +3118,18 @@ public class ClockInController {
AttSchedule att = attsch.get(dk.getSort()-cr); AttSchedule att = attsch.get(dk.getSort()-cr);
if(att.getDajl().getId() != null && att.getDajl().getStatus() != 17 && att.getDajl().getId() != 888) { if(att.getDajl().getId() != null && att.getDajl().getStatus() != 17 && att.getDajl().getId() != 888) {
att.setIsdk(0); att.setIsdk(0);
AttSchedule attw = attsch.get(dk.getSort()-1);
attw.setIsupdate(1);
}else { }else {
AttSchedule att1 = attsch.get(dk.getSort()+cr); AttSchedule att1 = attsch.get(dk.getSort()+cr);
att1.setIsdk(0); 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 { }else {
if(iscrdk) { if(iscrdk) {
AttSchedule attc = attsch.get(0); AttSchedule attc = attsch.get(0);
...@@ -3147,12 +3152,16 @@ public class ClockInController { ...@@ -3147,12 +3152,16 @@ public class ClockInController {
attc.setIsdk(0); attc.setIsdk(0);
}else { }else {
AttSchedule attc = attsch.get(cr); AttSchedule attc = attsch.get(cr);
if(attc.getDajl().getId() != null && attc.getDajl().getStatus() == 17 && attc.getDajl().getId() == 888) { Timestamp ag = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(attc.getTime())));
attc.getDajl().setId(null); if(ag.after(b)) {
attc.getDajl().setSort(null); if(attc.getDajl().getId() != null && attc.getDajl().getStatus() == 17 && attc.getDajl().getId() == 888) {
attc.getDajl().setStatus(null); attc.getDajl().setId(null);
} attc.getDajl().setSort(null);
attc.setIsdk(0); attc.getDajl().setStatus(null);
}
attc.setIsdk(0);
}
} }
} }
...@@ -3160,6 +3169,10 @@ public class ClockInController { ...@@ -3160,6 +3169,10 @@ public class ClockInController {
} }
} }
//当全为缺卡时
}else { }else {
//休息的时候 //休息的时候
List<AttSchedule> attsch_ = new ArrayList<AttSchedule>(); List<AttSchedule> attsch_ = new ArrayList<AttSchedule>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment