Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!386

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

@@ -1474,14 +1474,14 @@ public class ClockInController {
 					boolean dnck = false;
 					boolean crdk = false;//当次打卡是否存在次日打卡
 					if(balan != null) {//前一天是否打过卡    去班次id查询是否存在次日打卡
-						//班次信息
+						//昨日的班次信息
 						KqglAssoBcsz shif = kqglassobcszmapper.selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, balan.getBcid()));
 						int dkcs = shif.getSxbcs()*2;
 						List<AttSchedule> ashss = attdate.getAttsch();//获取今天应打卡时间
 						if(ashss.size() > 0) {
 							Date sd1=df1.parse(ClockInTool.stampToDate(String.valueOf(ashss.get(0).getTime())));//当天应打的首次上班卡时间
 							Date sd2=df1.parse(current_time);//当前时间
-							if(sd1.after(sd2)) {
+							if(sd1.after(sd2)) {//大于
 								dnck = true;
 							}
 						}
@@ -1510,7 +1510,11 @@ public class ClockInController {
 						}
 					}else {
 						//无记录的话就找昨天的数据
-//						AttendanceCardListDto attdate1 = MethodCall(qyid,userid,yesterday);
+						AttendanceCardListDto attdate1 = MethodCall(qyid,userid,yesterday);
+						List<AttSchedule> ashssyebo = attdate1.getAttsch();//获取昨天应打卡时间
+						
+						
+						
 					}
 					if(crdk && dnck) {
 						dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userid)

src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java

@@ -42,6 +42,7 @@ import cn.timer.api.dto.kqmk.AttSchedule;
 import cn.timer.api.dto.kqmk.AttendanceCardListDto;
 import cn.timer.api.dto.kqmk.KqglAssoPbmxDto;
 import cn.timer.api.utils.DateUtil;
+import cn.timer.api.utils.ResultUtil;
 
 /**
  * @author lal
@@ -719,8 +720,12 @@ public class KqglServiceImpl implements KqglService {
 		    						
 		    					}
 		    				}
+		    				if(isRange) {
+		    					dkmxid = pcd.getId();
+		    				}else {
+		    					throw new CustomException("当前时间，没有考勤异常无需补卡");
+		    				}
 		    				
-		    				dkmxid = pcd.getId();
 		    			}
 		    			
 		    			//0：打卡无效:此记录已被更新 1：正常 2：异常 3：迟到 4：早退 5：补卡 6：请假 7：加班 8：调休