fix

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

@@ -1,7 +1,10 @@
 package org.fouram.controller;
 
+import java.util.Date;
+
 import org.fouram.core.base.controller.BaseController;
 import org.fouram.core.util.AppUtil;
+import org.fouram.core.util.DateUtil;
 import org.fouram.core.util.AppUtil.ResultConstant;
 import org.fouram.core.util.LoggerUtil;
 import org.fouram.service.SapCheckService;
@@ -77,22 +80,6 @@ public class TaskController extends BaseController {
 	}
 	
 	/**
-	 * http://localhost:8080/sapcms/task/saveAllUserCheckOption
-	 * @return
-	 */
-	@RequestMapping(value = "/saveAllUserCheckOption", produces = "application/json;charset=utf-8")
-	@ResponseBody
-	public Object saveAllUserCheckOption() {
-		try {
-			sapCheckService.saveAllUserCheckOption();
-			return AppUtil.success();
-		} catch (Exception e) {
-			LoggerUtil.error(e);
-			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
-		}
-	}
-	
-	/**
 	 * http://localhost:8080/sapcms/task/saveReportBaseData
 	 * @return
 	 */
@@ -100,9 +87,12 @@ public class TaskController extends BaseController {
 	@ResponseBody
 	public Object saveReportBaseData() {
 		try {
-			sapCheckService.saveAllUserCheckData();
+			Date startDate = DateUtil.sdfTime.parse("2020-05-06 00:00:00");
+			Date endDate = DateUtil.sdfTime.parse("2020-05-09 23:59:59");
+			sapCheckService.saveAllUserCheckData(startDate, endDate);
 			sapCheckService.saveCheckoutStartAndEndData();
 			employeeTimeService.saveEmployeeTimes();
+			sapCheckService.saveAllUserCheckOption();
 			return AppUtil.success();
 		} catch (Exception e) {
 			LoggerUtil.error(e);
@@ -118,7 +108,7 @@ public class TaskController extends BaseController {
 	@ResponseBody
 	public Object saveReportResultData() {
 		try {
-//			sapCheckService.updateReportBaseData();
+			sapCheckService.updateReportBaseData();
 			sapCheckService.saveReportResultData();
 			return AppUtil.success();
 		} catch (Exception e) {

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

@@ -53,20 +53,18 @@ public class SapCheckService extends BaseService {
 		return map;
 	}
 
-	public void saveAllUserCheckData() throws Exception {
+	public void saveAllUserCheckData(Date startDate, Date endDate) throws Exception {
 		// 清空表记录
 		update("SapCheckMapper.truncateCheckin", null);
 		update("SapCheckMapper.truncateCheckoff", null);
 		update("SapCheckMapper.truncateCheckout", null);
-		
+
 		List<SapUser> users = userService.selectSuccessList();
 		Map<String, List<String>> map = groupList(users);
 		int count = 0;
 		for (String key : map.keySet()) {
 			count = count + 1;
-			List<WxCpCheckinData> checkinDatas = WXCpOaUtil.getCheckinData(
-					DateUtil.sdfTime.parse("2020-04-01 00:00:00"), DateUtil.sdfTime.parse("2020-04-30 23:59:59"),
-					map.get(key));
+			List<WxCpCheckinData> checkinDatas = WXCpOaUtil.getCheckinData(startDate, endDate, map.get(key));
 			System.out.println(checkinDatas.size());
 			int subCount = 0;
 			for (WxCpCheckinData data : checkinDatas) {
@@ -89,7 +87,7 @@ public class SapCheckService extends BaseService {
 			System.out.println(count);
 		}
 	}
-	
+
 	public void saveCheckoutStartAndEndData() throws Exception {
 		update("SapCheckMapper.truncateCheckoutStart", null);
 		update("SapCheckMapper.truncateCheckoutEnd", null);
@@ -100,7 +98,7 @@ public class SapCheckService extends BaseService {
 
 	public void saveAllUserCheckOption() throws Exception {
 		update("SapCheckMapper.truncateCheckOption", null);
-		
+
 		List<SapUser> users = userService.selectSuccessList();
 		Map<String, List<String>> map = groupList(users);
 		int count = 0;
@@ -108,6 +106,9 @@ public class SapCheckService extends BaseService {
 		datetimes.add(DateUtil.sdfTime.parse("2020-04-09 00:00:00"));
 		datetimes.add(DateUtil.sdfTime.parse("2020-04-10 00:00:00"));
 		datetimes.add(DateUtil.sdfTime.parse("2020-04-13 00:00:00"));
+		datetimes.add(DateUtil.sdfTime.parse("2020-05-07 00:00:00"));
+		datetimes.add(DateUtil.sdfTime.parse("2020-05-08 00:00:00"));
+		datetimes.add(DateUtil.sdfTime.parse("2020-05-09 00:00:00"));
 		for (String key : map.keySet()) {
 			count = count + 1;
 			List<WxCpCheckinOption> options = WXCpOaUtil.getCheckinOption(datetimes, map.get(key));
@@ -152,48 +153,48 @@ public class SapCheckService extends BaseService {
 
 	@SuppressWarnings("unchecked")
 	public void updateReportBaseData() throws Exception {
-		//处理重复数据
+		// 处理重复数据
 		List<SapCheck> sapChecks = (List<SapCheck>) findList("SapCheckMapper.selectRepeatCheckin", null);
 		Set<String> checkinDays = Sets.newHashSet();
-		for(SapCheck sapCheck : sapChecks) {
-			if(!checkinDays.contains(sapCheck.getCheckinDay() + sapCheck.getUserId())) {
+		for (SapCheck sapCheck : sapChecks) {
+			if (!checkinDays.contains(sapCheck.getCheckinDay() + sapCheck.getUserId())) {
 				checkinDays.add(sapCheck.getCheckinDay() + sapCheck.getUserId());
 			} else {
 				update("SapCheckMapper.deleteCheckin", sapCheck);
 			}
 		}
-		
+
 		sapChecks = (List<SapCheck>) findList("SapCheckMapper.selectRepeatCheckoff", null);
 		checkinDays = Sets.newHashSet();
-		for(SapCheck sapCheck : sapChecks) {
-			if(!checkinDays.contains(sapCheck.getCheckinDay() + sapCheck.getUserId())) {
+		for (SapCheck sapCheck : sapChecks) {
+			if (!checkinDays.contains(sapCheck.getCheckinDay() + sapCheck.getUserId())) {
 				checkinDays.add(sapCheck.getCheckinDay() + sapCheck.getUserId());
 			} else {
 				update("SapCheckMapper.deleteCheckoff", sapCheck);
 			}
 		}
-		
+
 		sapChecks = (List<SapCheck>) findList("SapCheckMapper.selectRepeatCheckoutStart", null);
 		checkinDays = Sets.newHashSet();
-		for(SapCheck sapCheck : sapChecks) {
-			if(!checkinDays.contains(sapCheck.getCheckinDay() + sapCheck.getUserId())) {
+		for (SapCheck sapCheck : sapChecks) {
+			if (!checkinDays.contains(sapCheck.getCheckinDay() + sapCheck.getUserId())) {
 				checkinDays.add(sapCheck.getCheckinDay() + sapCheck.getUserId());
 			} else {
 				update("SapCheckMapper.deleteCheckoutStart", sapCheck);
 			}
 		}
-		
+
 		sapChecks = (List<SapCheck>) findList("SapCheckMapper.selectRepeatCheckoutEnd", null);
 		checkinDays = Sets.newHashSet();
-		for(SapCheck sapCheck : sapChecks) {
-			if(!checkinDays.contains(sapCheck.getCheckinDay() + sapCheck.getUserId())) {
+		for (SapCheck sapCheck : sapChecks) {
+			if (!checkinDays.contains(sapCheck.getCheckinDay() + sapCheck.getUserId())) {
 				checkinDays.add(sapCheck.getCheckinDay() + sapCheck.getUserId());
 			} else {
 				update("SapCheckMapper.deleteCheckoutEnd", sapCheck);
 			}
 		}
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public void saveReportResultData() throws Exception {
 		// 生成报表数据
@@ -224,8 +225,8 @@ public class SapCheckService extends BaseService {
 			}
 		}
 		// 生成报表用户数据
-		update("SapCheckMapper.truncateCheckReportUser", null);
-		update("SapCheckMapper.saveCheckReportUser", null);
+//		update("SapCheckMapper.truncateCheckReportUser", null);
+//		update("SapCheckMapper.saveCheckReportUser", null);
 	}
 
 	// 是不是正确的上班时间