Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!415

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

@@ -2568,18 +2568,31 @@ public class ClockInController {
 					 int bsz = 0;
 					 int cr = 0;
 					 boolean iscrdk = true;
+					 String crlasttime = null;//次日最后打卡时间
 					 /****************次日开始***************/
 					 int sb1 = 0,xb1 = 0,sb2 = 0,xb2 = 0,sb3 = 0,xb3 = 0;
 					 //先判断前一天是否存在次日打卡的方式
 					 KqglAssoBcsz jianchashif = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, attsch.get(0).getId()));
-					 if(jianchashif.getIsSbdk1Cr() == 1) { sb1 = 1; }
-					 if(jianchashif.getIsXbdk1Cr() == 1) { xb1 = 1; }
-					 if(jianchashif.getIsSbdk2Cr() == 1) { sb2 = 1; }
-					 if(jianchashif.getIsXbdk2Cr() == 1) { xb2 = 1; }
-					 if(jianchashif.getIsSbdk3Cr() == 1) { sb3 = 1; }
-					 if(jianchashif.getIsXbdk3Cr() == 1) { xb3 = 1; }
+					 if(jianchashif.getIsSbdk1Cr() == 1) { 
+						 sb1 = 1; 
+						 crlasttime = (str+" "+jianchashif.getSbdk1()+":00").replaceAll("\r|\n", "");}
+					 if(jianchashif.getIsXbdk1Cr() == 1) { 
+						 xb1 = 1; 
+						 crlasttime = (str+" "+jianchashif.getXbdk1()+":00").replaceAll("\r|\n", "");}
+					 if(jianchashif.getIsSbdk2Cr() == 1) { 
+						 sb2 = 1; 
+						 crlasttime = (str+" "+jianchashif.getSbdk2()+":00").replaceAll("\r|\n", "");}
+					 if(jianchashif.getIsXbdk2Cr() == 1) { 
+						 xb2 = 1; 
+						 crlasttime = (str+" "+jianchashif.getXbdk2()+":00").replaceAll("\r|\n", "");}
+					 if(jianchashif.getIsSbdk3Cr() == 1) { 
+						 sb3 = 1; 
+						 crlasttime = (str+" "+jianchashif.getSbdk3()+":00").replaceAll("\r|\n", "");}
+					 if(jianchashif.getIsXbdk3Cr() == 1) { 
+						 xb3 = 1; 
+						 crlasttime = (str+" "+jianchashif.getXbdk3()+":00").replaceAll("\r|\n", "");}
 					 //
-					 if(sb1 == 1 ||xb1 == 1 || sb2 == 1 ||xb2 == 1 || sb3 == 1 ||xb3 == 1) {
+					 if(sb1 == 1 ||xb1 == 1 ||sb2 == 1 ||xb2 == 1 || sb3 == 1 ||xb3 == 1) {
 						 //前一天的班次
 						 AttendanceCardListDto beforeattdate = MethodCall(userBean.getOrgCode(),userBean.getEmpNum(),yesterday);
 						 //前一天的打卡数据
@@ -3031,10 +3044,24 @@ public class ClockInController {
 						 }else {
 							 if(iscrdk) {
 								 AttSchedule attc = attsch.get(0);
+								 if(attc.getDajl().getStatus() == 17 && attc.getDajl().getId() == 888) {
+									 attc.getDajl().setId(null);
+									 attc.getDajl().setSort(null);
+									 attc.getDajl().setStatus(null);
+								 }
 								 attc.setIsdk(0);
 							 }else {
-								 AttSchedule attc = attsch.get(cr);
-								 attc.setIsdk(0);
+								 if(crlasttime != null) {
+									 Timestamp dd = Timestamp.valueOf(crlasttime);
+									 if(dd.after(b)) {//after：大于  before：小于
+										 AttSchedule attc = attsch.get(0);
+										 attc.setIsdk(0);
+								 	 }else {
+								 		AttSchedule attc = attsch.get(cr);
+										 attc.setIsdk(0);
+								 	 }
+								 }
+								 
 							 }
 							 
 						 }