提交

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java

@@ -2803,6 +2803,14 @@ public class ClockInController {
 											 if(dkjl.getSort() == 2) {
 											 if(dkjl.getSort() == 2) {
 												 ash.setIsupdate(1);
 												 ash.setIsupdate(1);
 											 }
 											 }
+										 }else if(attdate.getAttsch().size() == 4) {
+											 if(dkjl.getSort() == 4) {
+												 ash.setIsupdate(1);
+											 }
+										 }else if(attdate.getAttsch().size() == 6) {
+											 if(dkjl.getSort() == 6) {
+												 ash.setIsupdate(1);
+											 }
 										 }
 										 }
 									 }
 									 }
 									 
 									 
@@ -2853,7 +2861,7 @@ public class ClockInController {
 								 }
 								 }
 							 }
 							 }
 							 //处理当天完全没打卡的数据
 							 //处理当天完全没打卡的数据
-							 if(ash.getIsdk() == 1 && b.after(tt) && dkcs == 0 && iscrdk) {
+							 if(ash.getIsdk() == 1 && b.after(tt) && dkcs == 0 && iscrdk && dkjl.getCardType() == null) {
 								 dkjl.setDktime(null);
 								 dkjl.setDktime(null);
 								 dkjl.setStatus(17);//缺卡
 								 dkjl.setStatus(17);//缺卡
 								 dkjl.setSort(ash.getSort());
 								 dkjl.setSort(ash.getSort());