Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!384

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

@@ -2277,7 +2277,10 @@ public class ClockInController {
 		 return ResultUtil.success(msg);
 		 return ResultUtil.success(msg);
 	 }
 	 }
 	 
 	 
-	 
+	 //****************************************************&&*******&&&******&&&****************************************************//
+	 //***************************************************&**&******&***&****&***&**************************************************//
+	 //**************************************************&&&&&&*****&&&******&&&****************************************************//
+	 //*************************************************&******&****&********&******************************************************//
 	//考勤组绑定的打卡方式
 	//考勤组绑定的打卡方式
 	@Autowired
 	@Autowired
 	private AttGroupBinPunchModeMapper attgroupbinpunchmodemapper;
 	private AttGroupBinPunchModeMapper attgroupbinpunchmodemapper;
@@ -2487,7 +2490,9 @@ public class ClockInController {
 									 //允许迟到范围
 									 //允许迟到范围
 									 if(results < yxcdfzs) {
 									 if(results < yxcdfzs) {
 										 dkjl.setResults(0);
 										 dkjl.setResults(0);
-										 dkjl.setStatus(1);
+										 if(dkjl.getStatus() == 3) {//原本是迟到的  但是在“允许迟到”范围内  则更改为正常
+											 dkjl.setStatus(1);
+										 }
 									 }
 									 }
 									 //严重迟到范围
 									 //严重迟到范围
 									 if(results>yzcdfzs && results < kgcdfzs && yzcdfzs>0) {
 									 if(results>yzcdfzs && results < kgcdfzs && yzcdfzs>0) {
@@ -2510,6 +2515,7 @@ public class ClockInController {
 						 
 						 
 						 KqglAssoBcsz shif = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, ash.getId()));
 						 KqglAssoBcsz shif = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, ash.getId()));
 						 Timestamp tt = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(ash.getTime())));
 						 Timestamp tt = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(ash.getTime())));
+						 //处理下班不用打卡的数据
 						 if(shif.getIsXbdk() == 1 && (ash.getSort())%2 == 0) { 
 						 if(shif.getIsXbdk() == 1 && (ash.getSort())%2 == 0) { 
 							 
 							 
 							 if(dkjl.getDktime() == null && b.after(tt)) {
 							 if(dkjl.getDktime() == null && b.after(tt)) {
@@ -2521,12 +2527,23 @@ public class ClockInController {
 								 dkjl.setStatus(1);
 								 dkjl.setStatus(1);
 							 }
 							 }
 						 }
 						 }
-						 
+						 //处理当天完全没打卡的数据
 						 if(ash.getIsdk() == 1 && b.after(tt) && dkcs == 0) {
 						 if(ash.getIsdk() == 1 && b.after(tt) && dkcs == 0) {
 							 dkjl.setDktime(null);
 							 dkjl.setDktime(null);
 							 dkjl.setStatus(17);//缺卡
 							 dkjl.setStatus(17);//缺卡
 							 dkjl.setSort(ash.getSort());
 							 dkjl.setSort(ash.getSort());
 							 dkjl.setId(888);
 							 dkjl.setId(888);
+							 //更新打卡关闭
+							 ash.setIsupdate(0);
+						 }
+						 
+						 //
+						 if(ash.getIsdk() == 1 && b.after(tt) && dkjl.getDktime() == null && dkjl.getId() == null && dkcs > 0) {
+							 dkjl.setStatus(17);//缺卡
+							 dkjl.setSort(ash.getSort());
+							 dkjl.setId(888);
+							 //更新打卡关闭
+							 ash.setIsupdate(0);
 						 }
 						 }
 						 
 						 
 						 /****/
 						 /****/