Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!438

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

@@ -3105,6 +3105,8 @@ public class ClockInController {
 						 }
 					 }
 					 
+					 System.out.println(attsch.get(attdate.getAttsch().size()-1).getTime());
+					 
 					 //全部为 1 时 iscrdk
 					 if(bccs == bc && b.before(d) && lcdkgb && isdkjj) {
 						 KqglAssoDkjl dk = KqglAssoDkjl.builder().build().selectOne(new QueryWrapper<KqglAssoDkjl>().lambda().eq(KqglAssoDkjl::getQyid, userBean.getOrgCode())
@@ -3114,7 +3116,12 @@ public class ClockInController {
 						 
 						 if(dk != null && attdate.getAttsch().size() != dk.getSort()) {
 							 AttSchedule att = attsch.get(dk.getSort()-cr);
-							 att.setIsdk(0);
+							 if(att.getDajl().getId() != null && att.getDajl().getStatus() != 17 && att.getDajl().getId() != 888) {
+								 att.setIsdk(0);
+							 }else {
+								 AttSchedule att1 = attsch.get(dk.getSort()+cr);
+								 att1.setIsdk(0);
+							 }
 							 
 							 AttSchedule attw = attsch.get(dk.getSort()-1);
 							 attw.setIsupdate(1);