Skip to content

8
8timerapiv200
Commit 475bd596 by leialin
Options

Merge branch 'lal' into 'develop' 

提交

See merge request 8timerv2/8timerapiv200!442
parents 34a492ec 7b7d3304
Showing with 61 additions and 6 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -2754,6 +2754,12 @@ public class ClockInController { ...@@ -2754,6 +2754,12 @@ public class ClockInController {
int r = 1; int r = 1;
// int bc = 0; // int bc = 0;
// int bsz = 0; // int bsz = 0;
boolean dk1 = true;//上
boolean dk2 = true;//下
boolean dk3 = true;
boolean dk4 = true;
boolean dk5 = true;
boolean dk6 = true;
for(AttSchedule ash : attsch) { for(AttSchedule ash : attsch) {
if(ash.getNextdaycard() == 0) { if(ash.getNextdaycard() == 0) {
if(attdate.getAttsch().size() == 2) { if(attdate.getAttsch().size() == 2) {
...@@ -2768,6 +2774,7 @@ public class ClockInController { ...@@ -2768,6 +2774,7 @@ public class ClockInController {
bsz = 1; bsz = 1;
ash.setIsdk(0); ash.setIsdk(0);
}else { }else {
dk1 = false;
bc++; bc++;
ash.setIsdk(1); ash.setIsdk(1);
...@@ -2786,6 +2793,7 @@ public class ClockInController { ...@@ -2786,6 +2793,7 @@ public class ClockInController {
bsz = 1; bsz = 1;
ash.setIsdk(0); ash.setIsdk(0);
}else { }else {
dk2 = false;
bc++; bc++;
ash.setIsdk(1); ash.setIsdk(1);
...@@ -2859,6 +2867,25 @@ public class ClockInController { ...@@ -2859,6 +2867,25 @@ public class ClockInController {
}else { }else {
bc++; bc++;
ash.setIsdk(1); ash.setIsdk(1);
if(ash.getSort() == 1) {
dk1 = false;
}
if(ash.getSort() == 2) {
dk2 = false;
}
if(ash.getSort() == 3) {
dk3 = false;
}
if(ash.getSort() == 4) {
dk4 = false;
}
if(ash.getSort() == 5) {
dk5 = false;
}
if(ash.getSort() == 6) {
dk6 = false;
}
} }
//是否请假 //是否请假
...@@ -3203,13 +3230,41 @@ public class ClockInController { ...@@ -3203,13 +3230,41 @@ public class ClockInController {
}else { }else {
if(iscrdk) { if(iscrdk) {
AttSchedule attc = attsch.get(0);
if(attc.getDajl().getId() != null && attc.getDajl().getStatus() == 17 && attc.getDajl().getId() == 888) { if(attdate.getAttsch().size() == 2) {
attc.getDajl().setId(null); AttSchedule attc = attsch.get(0);
attc.getDajl().setSort(null); AttSchedule attcto = attsch.get(1);
attc.getDajl().setStatus(null); Timestamp tt1 = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(attsch.get(0).getTime())));
Timestamp tt2 = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(attsch.get(1).getTime())));
if(!dk1 && dk2) {
attc.getDajl().setStatus(17);//缺卡
attc.getDajl().setSort(attc.getSort());
attc.getDajl().setId(888);
attc.setIsdk(1);
}
if(!dk1 && !dk2 && b.after(tt1) && b.before(tt2)) {
attcto.getDajl().setStatus(null);//缺卡
attcto.getDajl().setSort(null);
attcto.getDajl().setId(null);
attcto.setIsdk(0);
}
if(!dk1 && !dk2 && b.after(tt1) && b.after(tt2)) {
attcto.getDajl().setStatus(17);//缺卡
attcto.getDajl().setSort(attc.getSort());
attcto.getDajl().setId(888);
attcto.setIsdk(1);
}
}else if(attdate.getAttsch().size() == 4) {
AttSchedule attc = attsch.get(0);
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);
} }
attc.setIsdk(0);
}else { }else {
if(crlasttime != null) { if(crlasttime != null) {
Timestamp dd = Timestamp.valueOf(crlasttime); Timestamp dd = Timestamp.valueOf(crlasttime);
......
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