Skip to content

8
8timerapiv200
Commit e26d15fc by leialin
Options

Merge branch 'lal' into 'develop' 

提交

See merge request 8timerv2/8timerapiv200!408
parents eab53c9d bfc3feed
Showing with 16 additions and 14 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -2959,21 +2959,23 @@ public class ClockInController { ...@@ -2959,21 +2959,23 @@ public class ClockInController {
} }
//全部为缺卡时 没有打卡按钮显示 //全部为缺卡时 没有打卡按钮显示
if(attdate.getAttsch().size() == 2 || attdate.getAttsch().size() == 4 || attdate.getAttsch().size() == 6) { if(attsch.get(0).getDajl().getId() != null) {
if(attsch.get(0).getDajl().getId() == 888 && attsch.get(0).getDajl().getStatus() == 17 if(attdate.getAttsch().size() == 2 || attdate.getAttsch().size() == 4 || attdate.getAttsch().size() == 6) {
&&attsch.get(1).getDajl().getId() == 888 && attsch.get(1).getDajl().getStatus() == 17) { if(attsch.get(0).getDajl().getId() == 888 && attsch.get(0).getDajl().getStatus() == 17
lcdkgb = false; &&attsch.get(1).getDajl().getId() == 888 && attsch.get(1).getDajl().getStatus() == 17) {
lcdkgb = false;
}
}else if(attdate.getAttsch().size() == 4 || attdate.getAttsch().size() == 6) {
if(attsch.get(2).getDajl().getId() == 888 && attsch.get(2).getDajl().getStatus() == 17
&&attsch.get(3).getDajl().getId() == 888 && attsch.get(3).getDajl().getStatus() == 17) {
lcdkgb = false;
}
}else if(attdate.getAttsch().size() == 6) {
if(attsch.get(4).getDajl().getId() == 888 && attsch.get(4).getDajl().getStatus() == 17
&&attsch.get(5).getDajl().getId() == 888 && attsch.get(5).getDajl().getStatus() == 17) {
lcdkgb = false;
}
} }
}else if(attdate.getAttsch().size() == 4 || attdate.getAttsch().size() == 6) {
if(attsch.get(2).getDajl().getId() == 888 && attsch.get(2).getDajl().getStatus() == 17
&&attsch.get(3).getDajl().getId() == 888 && attsch.get(3).getDajl().getStatus() == 17) {
lcdkgb = false;
}
}else if(attdate.getAttsch().size() == 6) {
if(attsch.get(4).getDajl().getId() == 888 && attsch.get(4).getDajl().getStatus() == 17
&&attsch.get(5).getDajl().getId() == 888 && attsch.get(5).getDajl().getStatus() == 17) {
lcdkgb = false;
}
} }
......
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