fix

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

@@ -5,7 +5,7 @@ import org.fouram.core.base.controller.BaseController;
 import org.fouram.core.util.AppUtil;
 import org.fouram.core.util.AppUtil.ResultConstant;
 import org.fouram.core.util.LoggerUtil;
-import org.fouram.service.CheckTaskService;
+import org.fouram.service.SapCheckService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,22 +16,22 @@ import org.springframework.web.bind.annotation.ResponseBody;
 public class ReportController extends BaseController {
 
 	@Autowired
-	private CheckTaskService checkTaskService;
+	private SapCheckService sapCheckService;
 
 	/**
-	 * http://localhost:8080/sapcms/report/initReport?checkinDay=2020-05-11
+	 * http://localhost:8080/sapcms/report/updateReportResultData?checkinDay=2020-06-15
 	 * 
 	 * @return
 	 */
-	@RequestMapping(value = "/initReport", produces = "application/json;charset=utf-8")
+	@RequestMapping(value = "/updateReportResultData", produces = "application/json;charset=utf-8")
 	@ResponseBody
-	public Object initReport() {
+	public Object updateReportResultData() {
 		try {
 			String checkinDay = getPageData().getString("checkinDay");
 			if(StringUtils.isBlank(checkinDay)) {
 				return AppUtil.error("参数checkinDay为空");
 			}
-			checkTaskService.executeBiz(checkinDay);
+			sapCheckService.updateReportResultData(checkinDay, checkinDay);
 			return AppUtil.success();
 		} catch (Exception e) {
 			LoggerUtil.error(e);

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

@@ -59,5 +59,7 @@ public class CheckTaskService {
 		LoggerUtil.info("saveApprovalInfos:" + DateUtil.getTime());
 		sapCheckService.saveReportResultData(startDay, endDay);
 		LoggerUtil.info("saveReportResultData:" + DateUtil.getTime());
+		sapCheckService.updateReportResultData(startDay, endDay);
+		LoggerUtil.info("updateReportResultData:" + DateUtil.getTime());
 	}
 }

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

@@ -128,7 +128,6 @@ public class SapCheckService extends BaseService {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
 	public void saveReportResultData(String startDay, String endDay) throws Exception {
 		Map<String, String> param = Maps.newHashMap();
 		param.put("startDay", startDay);
@@ -139,6 +138,16 @@ public class SapCheckService extends BaseService {
 		// 生成报表数据
 		update("SapCheckMapper.deleteCheckReport", param);
 		update("SapCheckMapper.saveCheckReport", param);
+	}
+	
+	@SuppressWarnings("unchecked")
+	public void updateReportResultData(String startDay, String endDay) throws Exception {
+		Map<String, String> param = Maps.newHashMap();
+		param.put("startDay", startDay);
+		param.put("endDay", endDay);
+		param.put("startDayT", startDay.replace("-", ""));
+		param.put("endDayT", endDay.replace("-", ""));
+
 		// 更新华人时代人员上班时间可以推迟30分钟
 		update("SapCheckMapper.updateHrsdWorkTime", param);
 		// 更新所有异常事件的数据为异常数据