Skip to content

8
8timerapiv200
Commit 7b5ff63e by ilal
Options

提交

parent cd3ee808
Showing with 21 additions and 3 deletions
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
...@@ -101,7 +101,7 @@ public class AttendanceTaskTiming{ ...@@ -101,7 +101,7 @@ public class AttendanceTaskTiming{
//typeid:1-员工 2-考勤组 //typeid:1-员工 2-考勤组
// @Scheduled(cron = "0 */5 * * * ?") // @Scheduled(cron = "0 */5 * * * ?")
// @Scheduled(cron = "0 23 14 * * ?") // @Scheduled(cron = "0 55 15 * * ?")
@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行 @Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
public void AttendanceTask() throws ParseException { public void AttendanceTask() throws ParseException {
...@@ -583,7 +583,11 @@ public class AttendanceTaskTiming{ ...@@ -583,7 +583,11 @@ public class AttendanceTaskTiming{
//1:加班 2:请假 3:出差 4:外出 5:补卡 //1:加班 2:请假 3:出差 4:外出 5:补卡
int u = 0; int u = 0;
int p = 1; int p = 1;
for(String num : range) { for(String num : range) {
try {
String sjs = "",qinjia = "",chuaca = "",waichu = "",buka = "",jiaban = ""; String sjs = "",qinjia = "",chuaca = "",waichu = "",buka = "",jiaban = "";
if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xxts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(dkjtts),num)) { if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xxts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(dkjtts),num)) {
rowData.add("休息并打卡"); rowData.add("休息并打卡");
...@@ -814,6 +818,11 @@ public class AttendanceTaskTiming{ ...@@ -814,6 +818,11 @@ public class AttendanceTaskTiming{
u++; u++;
p++; p++;
} catch (Exception e) {
System.err.println("出错");
}
} }
}else { }else {
for (String num2 : range) { for (String num2 : range) {
......
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
...@@ -569,6 +569,8 @@ public class LastMonthtimingExport { ...@@ -569,6 +569,8 @@ public class LastMonthtimingExport {
//1:加班 2:请假 3:出差 4:外出 5:补卡 //1:加班 2:请假 3:出差 4:外出 5:补卡
int u = 0,p=1; int u = 0,p=1;
for(String num : range) { for(String num : range) {
try {
String sjs = "",qinjia = "",chuaca = "",waichu = "",buka = "",jiaban = ""; String sjs = "",qinjia = "",chuaca = "",waichu = "",buka = "",jiaban = "";
if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xxts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(dkjtts),num)) { if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xxts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(dkjtts),num)) {
rowData.add("休息并打卡"); rowData.add("休息并打卡");
...@@ -730,10 +732,10 @@ public class LastMonthtimingExport { ...@@ -730,10 +732,10 @@ public class LastMonthtimingExport {
if(!ClockInTool.contains(ClockInTool.deleteArrayNull(ycqts),num) && !ClockInTool.contains(ClockInTool.deleteArrayNull(xxts),num)) { if(!ClockInTool.contains(ClockInTool.deleteArrayNull(ycqts),num) && !ClockInTool.contains(ClockInTool.deleteArrayNull(xxts),num)) {
if(lea.getOvertimeTypeId() == 3) { if(lea.getOvertimeTypeId() == 3) {
if(lea.getCompensateId() == 1 || lea.getCompensateId() == 3) { if(lea.getCompensateId() == 1 || lea.getCompensateId() == 3) {
// holidayturncompenleave++; // holidayturncompenleave++;
holidayturncompenleave = holidayturncompenleave + lea.getDuration(); holidayturncompenleave = holidayturncompenleave + lea.getDuration();
}else if(lea.getCompensateId() == 2 || lea.getCompensateId() == 4) { }else if(lea.getCompensateId() == 2 || lea.getCompensateId() == 4) {
// holidaytransferovertime++; // holidaytransferovertime++;
holidaytransferovertime = holidaytransferovertime + lea.getDuration(); holidaytransferovertime = holidaytransferovertime + lea.getDuration();
} }
} }
...@@ -815,6 +817,9 @@ public class LastMonthtimingExport { ...@@ -815,6 +817,9 @@ public class LastMonthtimingExport {
u++; u++;
p++; p++;
} catch (Exception e) {
System.err.println("出错");
}
} }
}else { }else {
for (String num2 : range) { for (String num2 : range) {
......
src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java
...@@ -560,6 +560,7 @@ public class RealTimeUpdate{ ...@@ -560,6 +560,7 @@ public class RealTimeUpdate{
int p = 1; int p = 1;
for(String num : range) { for(String num : range) {
try {
String sjs = "",qinjia = "",chuaca = "",waichu = "",buka = "",jiaban = ""; String sjs = "",qinjia = "",chuaca = "",waichu = "",buka = "",jiaban = "";
if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xxts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(dkjtts),num)) { if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xxts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(dkjtts),num)) {
rowData.add("休息并打卡"); rowData.add("休息并打卡");
...@@ -789,6 +790,9 @@ public class RealTimeUpdate{ ...@@ -789,6 +790,9 @@ public class RealTimeUpdate{
u++; u++;
p++; p++;
} catch (Exception e) {
System.err.println("出错");
}
} }
}else { }else {
for (String num2 : range) { for (String num2 : range) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment