Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!413

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

@@ -1009,7 +1009,7 @@ public class ClockInController {
 					KqglAssoDkjl.builder().id(dkjj.getId()).status(0).sort(0).build().updateById();
 					msg = "打卡已更新数据";
 					sbyf = 0;
-					status_ = 2;
+//					status_ = 2;
 				}
 					
 					int results = 0;
@@ -2342,7 +2342,7 @@ public class ClockInController {
 					KqglAssoDkjl.builder().id(dkjj.getId()).status(0).sort(0).build().updateById();
 					msg = "打卡已更新数据";
 					sbyf = 0;
-					status_ = 2;
+//					status_ = 2;
 				}
 				
 				int results = 0;
@@ -2682,7 +2682,7 @@ public class ClockInController {
 											 ash.setIsdk(1);
 											 
 											 
-											 if(!now.equals(timme)) {//小于
+											 if(!now.equals(timme)) {
 												 ash.setIsupdate(0);
 											 }else {
 												 
@@ -2699,7 +2699,7 @@ public class ClockInController {
 											 bc++;
 											 ash.setIsdk(1);
 											 
-											 if(!now.equals(timme)) {//小于
+											 if(!now.equals(timme)) {
 												 ash.setIsupdate(0);
 											 }else {
 												 if(isxbdk == 2) {
@@ -2797,6 +2797,15 @@ public class ClockInController {
 									 int bcid = dkjl.getBcid();
 									 int results = dkjl.getResults();
 									 KqglAssoBcsz bcsz = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, bcid));
+									 
+									 if(now.equals(ClockInTool.stampToDate2(String.valueOf(ash.getTime())))) {
+										 if(attdate.getAttsch().size() == 2) {
+											 if(dkjl.getSort() == 2) {
+												 ash.setIsupdate(1);
+											 }
+										 }
+									 }
+									 
 									 if(bcsz != null) {
 										 int yxcdfzs = bcsz.getYxcdfzs();//允许迟到分钟数
 										 int yzcdfzs = bcsz.getYzcdfzs();//严重迟到分钟数