Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!557

pom.xml

@@ -217,22 +217,24 @@
 		</dependency> -->
 		</dependency> -->
 
 
 		<!-- redis starter   spring boot 与redis应用基本环境配置 -->
 		<!-- redis starter   spring boot 与redis应用基本环境配置 -->
-		<dependency> 
+		<!-- <dependency> 
 			<groupId>org.springframework.boot</groupId> 
 			<groupId>org.springframework.boot</groupId> 
 			<artifactId>spring-boot-starter-data-redis</artifactId> 
 			<artifactId>spring-boot-starter-data-redis</artifactId> 
-		</dependency>
+		</dependency> -->
+		
 		<!-- https://mvnrepository.com/artifact/org.springframework.session/spring-session-data-redis -->
 		<!-- https://mvnrepository.com/artifact/org.springframework.session/spring-session-data-redis -->
 		<!--spring session 与redis应用基本环境配置,需要开启redis后才可以使用，不然启动Spring boot会报错 -->
 		<!--spring session 与redis应用基本环境配置,需要开启redis后才可以使用，不然启动Spring boot会报错 -->
-		<dependency> 
+		<!-- <dependency> 
 			<groupId>org.springframework.session</groupId> 
 			<groupId>org.springframework.session</groupId> 
 			<artifactId>spring-session-data-redis</artifactId> 
 			<artifactId>spring-session-data-redis</artifactId> 
-		</dependency>
+		</dependency> -->
+		
 		<!--jedis --> 
 		<!--jedis --> 
-		<dependency> 
+		<!-- <dependency> 
 			<groupId>redis.clients</groupId> 
 			<groupId>redis.clients</groupId> 
 			<artifactId>jedis</artifactId> 
 			<artifactId>jedis</artifactId> 
 			<version>2.9.0</version> 
 			<version>2.9.0</version> 
-		</dependency>
+		</dependency> -->
 
 
 
 
 
 

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 19 18 * * ?")
+//	@Scheduled(cron = "0 18 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 {
 
 
@@ -823,7 +823,7 @@ public class AttendanceTaskTiming{
 				    				rowData.add("未排班");
 				    				rowData.add("未排班");
 				    			}
 				    			}
 							}
 							}
-							System.err.print("该员工未加入考勤组");
+							System.err.print(user.getEmpnum()+"该员工未加入考勤组");
 						}
 						}
 							
 							
 						String[] range1=ClockInTool.listToString(rowData).split(";");
 						String[] range1=ClockInTool.listToString(rowData).split(";");

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

@@ -824,7 +824,7 @@ public class LastMonthtimingExport {
 			    				rowData.add("未排班");
 			    				rowData.add("未排班");
 			    			}
 			    			}
 						}
 						}
-						System.err.print("该员工未加入考勤组");
+						System.err.print(user.getEmpnum()+"该员工未加入考勤组");
 					}
 					}
 						
 						
 					String[] range1=ClockInTool.listToString(rowData).split(";");
 					String[] range1=ClockInTool.listToString(rowData).split(";");