From fae33e2a1fe498666280897dd3d4149e345067e0 Mon Sep 17 00:00:00 2001 From: youling <youling@youlingdeMacBook-Pro.local> Date: Fri, 25 Dec 2020 17:09:26 +0800 Subject: [PATCH] 定时器 --- src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java b/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java index 883b9ef..8d51312 100644 --- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java +++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java @@ -233,7 +233,7 @@ public class AttendanceTaskTiming{ if(attgro.getPbfs() == 1){ //固定排班 List<KqglAssoTeshu> bxdklist = kqglassoteshumapper.ShouldSpecialDatessetByKqzid(attgro.getId(), ttstr,1);//当前月 必须打卡日期 int bxdk = bxdklist.size(); - log.error("bxdk数据为:" + bxdk); + String[] bxdkss = new String[bxdk];////特殊-必须打卡天数(工作日) int b = 0; for(KqglAssoTeshu bxd : bxdklist) { @@ -272,7 +272,7 @@ public class AttendanceTaskTiming{ int y = 0,q = 0,jj = 0,xx = 0;//jj:节假日 String[] zdxx = new String[31];//法定休息的具体天数(yyyy-MM-dd) int wd = ClockInTool.getDaysByYearMonth(year,month); - log.error("ClockInTool:" + wd); + for(int i = 1; i <= wd; i++){ boolean xixi = true; @@ -280,12 +280,11 @@ public class AttendanceTaskTiming{ for(int u=0;u<week.length;u++){ String webbuf = sdf2.format(date1); - log.error("webbuf:" + webbuf + " week[u]:" + week[u]); + if(webbuf.equals(week[u])){ q++; y++; - log.error("appmaps: " + appmaps.toString()); if(Arrays.asList(appmaps).contains(String.valueOf(sdf1.format(date1)))){ y = y-1; } -- libgit2 0.26.0