Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!436

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

@@ -217,6 +217,8 @@ public class ClockInController {
 								}
 								}
 								
 								
 							}else {
 							}else {
+								List<AttSchedule> ashss = attdate.getAttsch();//获取今天应打卡时间
+								
 								//无记录的话就找昨天的数据
 								//无记录的话就找昨天的数据
 								AttendanceCardListDto attdate1 = MethodCall(qyid,userid,yesterday);
 								AttendanceCardListDto attdate1 = MethodCall(qyid,userid,yesterday);
 								List<AttSchedule> ashssyebo = attdate1.getAttsch();//获取昨天应打卡时间
 								List<AttSchedule> ashssyebo = attdate1.getAttsch();//获取昨天应打卡时间
@@ -228,9 +230,25 @@ public class ClockInController {
 									}
 									}
 								}
 								}
 								
 								
+//								crdk = true;
+//								attdate = MethodCall(qyid,userid,yesterday);
+								if(EmptyUtil.isNotEmpty(attdate.getAttsch()) && ashss.get(0).getId() != 0) {//班次不为空
+									KqglAssoBcsz shifi = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, ashss.get(0).getId()));
+									int isXbdk1Cr = shifi.getIsXbdk1Cr();//下班1是否次日（0：否；1：是）
+									int isSbdk2Cr = shifi.getIsSbdk2Cr();//上班2是否次日（0：否；1：是）
+									int isXbdk2Cr = shifi.getIsXbdk2Cr();//下班2是否次日（0：否；1：是）
+									int isSbdk3Cr = shifi.getIsSbdk3Cr();//上班3是否次日（0：否；1：是）
+									int isXbdk3Cr = shifi.getIsXbdk3Cr();//下班3是否次日（0：否；1：是）
+									
+									if((isXbdk1Cr + isSbdk2Cr +isXbdk2Cr +  isSbdk3Cr + isXbdk3Cr) > 0) {
 										crdk = true;
 										crdk = true;
 										
 										
 										attdate = MethodCall(qyid,userid,yesterday);
 										attdate = MethodCall(qyid,userid,yesterday);
+										
+									}else {
+										crdk = false;
+									}
+								}
 							}
 							}
 							
 							
 							if(crdk && dnck) {
 							if(crdk && dnck) {