liupeng 4 éve
szülő
commit
074ea660ae

+ 5 - 9
code/sapparent/sapcms/src/main/java/org/fouram/controller/ReportController.java

@@ -19,7 +19,7 @@ public class ReportController extends BaseController {
 	private AutoCheckJob autoCheckJob;
 
 	/**
-	 * http://localhost:8080/sapcms/report/initReport?startDay=2020-05-11&endDay=2020-05-15
+	 * http://localhost:8080/sapcms/report/initReport?checkinDay=2020-05-11
 	 * 
 	 * @return
 	 */
@@ -27,15 +27,11 @@ public class ReportController extends BaseController {
 	@ResponseBody
 	public Object initReport() {
 		try {
-			String startDay = getPageData().getString("startDay");
-			String endDay = getPageData().getString("endDay");
-			if(StringUtils.isBlank(startDay)) {
-				return AppUtil.error("参数startDay为空");
+			String checkinDay = getPageData().getString("checkinDay");
+			if(StringUtils.isBlank(checkinDay)) {
+				return AppUtil.error("参数checkinDay为空");
 			}
-			if(StringUtils.isBlank(endDay)) {
-				return AppUtil.error("参数endDay为空");
-			}
-			autoCheckJob.executeBiz();
+			autoCheckJob.executeBiz(checkinDay);
 			return AppUtil.success();
 		} catch (Exception e) {
 			LoggerUtil.error(e);

+ 5 - 5
code/sapparent/sapservice/src/main/java/org/fouram/job/AutoCheckJob.java

@@ -32,9 +32,9 @@ public class AutoCheckJob {
 	@Autowired
 	private SapApprovalInfoService sapApprovalInfoService;
 
-	public void executeBiz() {
-		String startDay = DateUtil.getDate();
-		String endDay = DateUtil.getDate();
+	public void executeBiz(String checkinDay) {
+		String startDay = checkinDay;
+		String endDay = checkinDay;
 		try {
 			wxDepartService.saveDeparts();
 			wxUserService.saveUsers();
@@ -57,7 +57,7 @@ public class AutoCheckJob {
 	@Transactional
 	public void executeJob1() {
 		LoggerUtil.info("executeJob1 : " + DateUtil.getTime());
-		executeBiz();
+		executeBiz(DateUtil.getDate());
 		LoggerUtil.info("executeJob1 : " + DateUtil.getTime());
 	}
 	
@@ -65,7 +65,7 @@ public class AutoCheckJob {
 	@Transactional
 	public void executeJob2() {
 		LoggerUtil.info("executeJob2 : " + DateUtil.getTime());
-		executeBiz();
+		executeBiz(DateUtil.getDate());
 		LoggerUtil.info("executeJob2 : " + DateUtil.getTime());
 	}
 }