Merge branch 'lal' into develop

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

@@ -290,7 +290,7 @@ public class AttendanceTaskTiming{
 									String yemo = year + "-" + month;
 									String yemo = year + "-" + month;
 									sdf1.setLenient(false);
 									sdf1.setLenient(false);
 									int y = 0,q = 0,jj = 0,xx = 0;//jj:节假日
 									int y = 0,q = 0,jj = 0,xx = 0;//jj:节假日
-									String[] zdxx = new String[20];//法定休息的具体天数（yyyy-MM-dd）
+									String[] zdxx = new String[31];//法定休息的具体天数（yyyy-MM-dd）
 									 for(int i = 1; i <= ClockInTool.getDaysByYearMonth(year,month); i++){
 									 for(int i = 1; i <= ClockInTool.getDaysByYearMonth(year,month); i++){
 										 boolean xixi = true;
 										 boolean xixi = true;
 											Date date1 = sdf1.parse(yemo + "-" + i);
 											Date date1 = sdf1.parse(yemo + "-" + i);

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

@@ -279,7 +279,7 @@ public class LastMonthtimingExport {
 								String yemo = year + "-" + month;
 								String yemo = year + "-" + month;
 								sdf1.setLenient(false);
 								sdf1.setLenient(false);
 								int y = 0,q = 0,jj = 0,xx = 0;//jj:节假日
 								int y = 0,q = 0,jj = 0,xx = 0;//jj:节假日
-								String[] zdxx = new String[20];//法定休息的具体天数（yyyy-MM-dd）
+								String[] zdxx = new String[31];//法定休息的具体天数（yyyy-MM-dd）
 								 for(int i = 1; i <= ClockInTool.getDaysByYearMonth(year,month); i++){
 								 for(int i = 1; i <= ClockInTool.getDaysByYearMonth(year,month); i++){
 									 	boolean xixi = true;
 									 	boolean xixi = true;
 										Date date1 = sdf1.parse(yemo + "-" + i);
 										Date date1 = sdf1.parse(yemo + "-" + i);

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

@@ -267,7 +267,7 @@ public class RealTimeUpdate{
 							String yemo = year + "-" + month;
 							String yemo = year + "-" + month;
 							sdf1.setLenient(false);
 							sdf1.setLenient(false);
 							int y = 0,q = 0,jj = 0,xx = 0;//jj:节假日
 							int y = 0,q = 0,jj = 0,xx = 0;//jj:节假日
-							String[] zdxx = new String[20];//法定休息的具体天数（yyyy-MM-dd）
+							String[] zdxx = new String[31];//法定休息的具体天数（yyyy-MM-dd）
 							 for(int i = 1; i <= ClockInTool.getDaysByYearMonth(year,month); i++){
 							 for(int i = 1; i <= ClockInTool.getDaysByYearMonth(year,month); i++){
 								 boolean xixi = true;
 								 boolean xixi = true;
 									Date date1 = sdf1.parse(yemo + "-" + i);
 									Date date1 = sdf1.parse(yemo + "-" + i);