Skip to content

8
8timerapiv200
Commit 2fca9a89 by ilal Committed by chenzg
Options

提交

parent 6d08204d
Showing with 4 additions and 3 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -2641,7 +2641,7 @@ public class ClockInController { ...@@ -2641,7 +2641,7 @@ public class ClockInController {
Timestamp tt = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(befo.getTime()))); Timestamp tt = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(befo.getTime())));
if(attschbefo.getIsdk() == 1 && b.after(tt)) { if(attschbefo.getIsdk() == 1 && b.after(tt) && isdkjl) {
dkjlbefo.setStatus(17);//缺卡 dkjlbefo.setStatus(17);//缺卡
dkjlbefo.setSort(befo.getSort()); dkjlbefo.setSort(befo.getSort());
dkjlbefo.setId(888); dkjlbefo.setId(888);
...@@ -2844,7 +2844,7 @@ public class ClockInController { ...@@ -2844,7 +2844,7 @@ public class ClockInController {
} }
} }
//处理当天完全没打卡的数据 //处理当天完全没打卡的数据
if(ash.getIsdk() == 1 && b.after(tt) && dkcs == 0) { if(ash.getIsdk() == 1 && b.after(tt) && dkcs == 0 && iscrdk) {
dkjl.setDktime(null); dkjl.setDktime(null);
dkjl.setStatus(17);//缺卡 dkjl.setStatus(17);//缺卡
dkjl.setSort(ash.getSort()); dkjl.setSort(ash.getSort());
...@@ -2855,7 +2855,7 @@ public class ClockInController { ...@@ -2855,7 +2855,7 @@ public class ClockInController {
} }
// //
if(ash.getIsdk() == 1 && b.after(tt) && dkjl.getDktime() == null && dkjl.getId() == null && dkcs > 0) { if(ash.getIsdk() == 1 && b.after(tt) && dkjl.getDktime() == null && dkjl.getId() == null && dkcs > 0 && iscrdk) {
dkjl.setStatus(17);//缺卡 dkjl.setStatus(17);//缺卡
dkjl.setSort(ash.getSort()); dkjl.setSort(ash.getSort());
dkjl.setId(8881); dkjl.setId(8881);
...@@ -2976,6 +2976,7 @@ public class ClockInController { ...@@ -2976,6 +2976,7 @@ public class ClockInController {
} }
} }
//当天最后一个班打完后 打卡按钮全部不显示
boolean isdkjj = true; boolean isdkjj = true;
if(attdate.getAttsch().size() == 2) { if(attdate.getAttsch().size() == 2) {
if(attsch.get(1).getDajl().getId() != null && attsch.get(1).getDajl().getDktime() != null) { if(attsch.get(1).getDajl().getId() != null && attsch.get(1).getDajl().getDktime() != null) {
......
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