From 9d66585e0327dd64e16516d554ef9a8e5126f87e Mon Sep 17 00:00:00 2001
From: ilal <lalqqhy@163.com>
Date: Sat, 10 Oct 2020 11:08:49 +0800
Subject: [PATCH] 提交
---
src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java | 6 ++++--
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java | 14 +++++++++-----
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java | 9 +++++----
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java b/src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java
index b3cc1a2..8d7b52b 100644
--- a/src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java
@@ -363,8 +363,10 @@ public class ClockInTool {
Iterator<String> it = arrList.iterator();
while (it.hasNext()) {
String x = it.next();
- if (x.indexOf(target) != -1) {
- it.remove();
+ if(x != null) {
+ if (x.indexOf(target) != -1) {
+ it.remove();
+ }
}
}
res = new String[arrList.size()];
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 68d8c74..0d3fc83 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
@@ -98,7 +98,7 @@ public class AttendanceTaskTiming{
//typeid:1-员工 2-考勤组
// @Scheduled(cron = "0 */5 * * * ?")
-// @Scheduled(cron = "0 42 14 * * ?")
+// @Scheduled(cron = "0 0 11 * * ?")
@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
public void AttendanceTask() throws ParseException {
@@ -133,7 +133,7 @@ public class AttendanceTaskTiming{
List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>());//系统中的所有公司 所有未到期的公司
-// List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>().lambda().eq(QyzxEntInfoM::getId, 3));
+// List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>().lambda().eq(QyzxEntInfoM::getId, 6));
for(int t = 0;t<orgcodelist.size();t++){
int org_code = orgcodelist.get(t).getId();//企业组织代码
@@ -298,7 +298,7 @@ public class AttendanceTaskTiming{
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 ++;
@@ -350,7 +350,11 @@ public class AttendanceTaskTiming{
xxts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(xxts), num);//为必须上班的话从休息日期中去除
}
if(ClockInTool.useArrayUtils(appmaps, num)) {//检查是否存在 无需打卡名单中
- 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];
@@ -364,7 +368,7 @@ public class AttendanceTaskTiming{
//当前考勤组开启法定节假日休息开关
- if(attgro.getIsFdjjr().equals(1)) {
+ if(attgro.getIsFdjjr().equals(11111)) {
//法定节假日
if(ClockInTool.useArrayUtils(holidays, num)) {//法定节假日沦为休息日计算
// ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
diff --git a/src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java b/src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
index 59ebe5c..cb2ddb1 100644
--- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
@@ -90,7 +90,7 @@ public class LastMonthtimingExport {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-// @Scheduled(cron = "0 7 15 * * ?")
+// @Scheduled(cron = "0 5 11 * * ?")
@Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点，下午20点 执行
public void LastMonthtimingAttendanceTask() throws ParseException {
@@ -286,7 +286,7 @@ public class LastMonthtimingExport {
y = y-1;
}
- if(attgro.getIsFdjjr().equals(1)) {
+ if(attgro.getIsFdjjr().equals(111)) {
if(Arrays.asList(holidays).contains(String.valueOf(sdf1.format(date1)))){
y = y-1;
jj ++;
@@ -336,7 +336,8 @@ public class LastMonthtimingExport {
xxts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(xxts), num);//为必须上班的话从休息日期中去除
}
if(ClockInTool.useArrayUtils(appmaps, num)) {//检查是否存在 无需打卡名单中
- 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];
@@ -349,7 +350,7 @@ public class LastMonthtimingExport {
}
//当前考勤组开启法定节假日休息开关
- if(attgro.getIsFdjjr().equals(1)) {
+ if(attgro.getIsFdjjr().equals(11111)) {
//法定节假日
if(ClockInTool.useArrayUtils(holidays, num)) {//法定节假日沦为休息日计算
// ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
--
libgit2 0.26.0