Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!569

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

@@ -101,7 +101,7 @@ public class AttendanceTaskTiming{
 	//typeid:1-员工  2-考勤组 
 	//typeid:1-员工  2-考勤组 
 
 
 //	@Scheduled(cron = "0 */5 * * * ?")
 //	@Scheduled(cron = "0 */5 * * * ?")
-//	@Scheduled(cron = "0 32 14 * * ?")
+//	@Scheduled(cron = "0 23 14 * * ?")
 	@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 {
 
 
@@ -459,7 +459,7 @@ public class AttendanceTaskTiming{
 										}
 										}
 									}
 									}
 								}else{
 								}else{
-									List<AttendanceWeeklySch> atwek = attendanceweeklyschmapper.selectAttendanceMadeByUserid(user.getEmpnum(),org_code);
+									List<AttendanceWeeklySch> atwek = attendanceweeklyschmapper.selectAttendanceMadeByZhou(user.getEmpnum(),org_code);
 									String[] week= new String[atwek.size()];
 									String[] week= new String[atwek.size()];
 									int e = 0;
 									int e = 0;
 									String[] ziyoupb = new String[atwek.size()];
 									String[] ziyoupb = new String[atwek.size()];

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

@@ -445,7 +445,7 @@ public class LastMonthtimingExport {
 									}
 									}
 								}
 								}
 							}else{
 							}else{
-								List<AttendanceWeeklySch> atwek = attendanceweeklyschmapper.selectAttendanceMadeByUserid(user.getEmpnum(),org_code);
+								List<AttendanceWeeklySch> atwek = attendanceweeklyschmapper.selectAttendanceMadeByZhou(user.getEmpnum(),org_code);
 								String[] week= new String[atwek.size()];
 								String[] week= new String[atwek.size()];
 								int e = 0;
 								int e = 0;
 								String[] ziyoupb = new String[atwek.size()];
 								String[] ziyoupb = new String[atwek.size()];

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

@@ -434,7 +434,7 @@ public class RealTimeUpdate{
 								}
 								}
 							}
 							}
 						}else{
 						}else{
-							List<AttendanceWeeklySch> atwek = attendanceweeklyschmapper.selectAttendanceMadeByUserid(user.getEmpnum(),org_code);
+							List<AttendanceWeeklySch> atwek = attendanceweeklyschmapper.selectAttendanceMadeByZhou(user.getEmpnum(),org_code);
 							String[] week= new String[atwek.size()];
 							String[] week= new String[atwek.size()];
 							int e = 0;
 							int e = 0;
 							String[] ziyoupb = new String[atwek.size()];
 							String[] ziyoupb = new String[atwek.size()];