fix

code/sapparent/sapcms/src/main/java/org/fouram/controller/ReportController.java

@@ -36,7 +36,7 @@ public class ReportController extends BaseController {
 				return AppUtil.error("参数checkinDay为空");
 			}
 			for(String day : checkinDay.split(",")) {
-				checkTaskSchedule.executeBiz(day, "23");
+				checkTaskSchedule.executeBiz(day);
 				LoggerUtil.info("saveReportData->" + day);
 			}
 			return AppUtil.success();
@@ -59,7 +59,7 @@ public class ReportController extends BaseController {
 			if (StringUtils.isBlank(checkinDay)) {
 				return AppUtil.error("参数checkinDay为空");
 			}
-			wxCheckService.updateReportResultData(checkinDay, checkinDay, "23");
+			wxCheckService.updateReportResultData(checkinDay, checkinDay);
 			return AppUtil.success();
 		} catch (Exception e) {
 			LoggerUtil.error(e);

code/sapparent/sapservice/src/main/java/org/fouram/core/util/DateUtil.java

@@ -312,7 +312,7 @@ public class DateUtil {
 	}
 
 	public static void main(String[] args) throws Exception {
-		System.out.println(getSubDateList("2020-06-01", "2020-06-11"));
+		System.out.println(getSubDateList(getAfterDay(-31), getDay()));
 	}
 
 	// 根据开始日期 增加 月份后 算出 日期(yyyy-mm)

code/sapparent/sapservice/src/main/java/org/fouram/job/CheckTaskSchedule.java

@@ -39,12 +39,19 @@ public class CheckTaskSchedule {
 	public void taskBiz() throws Exception {
 		LoggerUtil.info(DateUtil.getTime());
 		try {
-			if (DateUtil.getHour().equals("10") || DateUtil.getHour().equals("12") || DateUtil.getHour().equals("20")
-					|| DateUtil.getHour().equals("23")) {
+			if (DateUtil.getHour().equals("10") || DateUtil.getHour().equals("20")) {
 				LoggerUtil.info("执行开始:" + DateUtil.getTime());
-				executeBiz(DateUtil.getDay(), DateUtil.getHour());
+				executeBiz(DateUtil.getDay());
 				LoggerUtil.info("执行结束:" + DateUtil.getTime());
 			}
+			if (DateUtil.getHour().equals("2")) {
+				// 重新执行最近30天
+				for (String day : DateUtil.getSubDateList(DateUtil.getAfterDay(-30), DateUtil.getDay())) {
+					LoggerUtil.info("执行开始:" + DateUtil.getTime());
+					executeBiz(day);
+					LoggerUtil.info("执行结束:" + DateUtil.getTime());
+				}
+			}
 		} catch (Exception e) {
 			WXCpMessageUtil.sendAdminError(Tools.getExceptionAllInfo(e));
 			LoggerUtil.error(e);
@@ -52,7 +59,7 @@ public class CheckTaskSchedule {
 	}
 
 	@Transactional
-	public void executeBiz(String checkinDay, String hour) throws Exception {
+	public void executeBiz(String checkinDay) throws Exception {
 		String startDay = checkinDay;
 		String endDay = checkinDay;
 		wxDepartService.saveWxDeparts();
@@ -85,7 +92,7 @@ public class CheckTaskSchedule {
 		}
 		wxCheckService.saveReportResultData(startDay, endDay, specialCheckinDay);
 		LoggerUtil.info("saveReportResultData:" + DateUtil.getTime());
-		wxCheckService.updateReportResultData(startDay, endDay, hour);
+		wxCheckService.updateReportResultData(startDay, endDay);
 		LoggerUtil.info("updateReportResultData:" + DateUtil.getTime());
 	}
 }

code/sapparent/sapservice/src/main/java/org/fouram/service/WxCheckService.java

@@ -138,9 +138,9 @@ public class WxCheckService extends BaseService {
 		update("SapCheckMapper.saveCheckReport", param);
 	}
 
-	public void updateReportResultData(String startDay, String endDay, String hour) throws Exception {
+	public void updateReportResultData(String startDay, String endDay) throws Exception {
 		Map<String, String> param = Maps.newHashMap();
-		param.put("hour", hour);
+		param.put("hour", "");
 		param.put("startDay", startDay);
 		param.put("endDay", endDay);
 		param.put("startDayT", startDay.replace("-", ""));