Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!520

src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java

@@ -277,7 +277,7 @@ public class RealTimeUpdate{
 												y = y-1;
 											}
 											
-											if(attgro.getIsFdjjr().equals(1)) {
+											if(attgro.getIsFdjjr().equals(1111)) {
 												if(Arrays.asList(holidays).contains(String.valueOf(sdf1.format(date1)))){
 													y = y-1;
 													jj ++;
@@ -327,7 +327,8 @@ public class RealTimeUpdate{
 									xxts =	ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(xxts), num);//为必须上班的话从休息日期中去除
 								}
 								if(Arrays.binarySearch(appmaps, num) >= 0) {//检查是否存在 无需打卡名单中
-									ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
+									ycqts = ClockInTool.doChinFilters(ycqts, num);//为必须休息的话从上班日期中去除
+//									ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
 									zjgzts = zjgzts - 1;
 									
 									String[] xxtst = new String[xxts.length + zj];
@@ -340,7 +341,7 @@ public class RealTimeUpdate{
 								}
 								
 								//当前考勤组开启法定节假日休息开关
-								if(attgro.getIsFdjjr().equals(1)) {
+								if(attgro.getIsFdjjr().equals(1111)) {
 									//法定节假日
 									if(ClockInTool.useArrayUtils(holidays, num)) {//法定节假日沦为休息日计算
 //										ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除