liupeng 4 years ago
parent
commit
e1d6f02f62

+ 5 - 0
code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapCheckMapper.xml

@@ -117,6 +117,11 @@
 			and f.approvalStatus = 'APPROVED' and f.delFlag=0 and a.result = '异常'
 	</update>
 	
+	<update id="updateAllHour">
+		update sap_check_report set hour = #{hour} 
+		where checkinDay >= #{startDay} and checkinDay &lt;= #{endDay}
+	</update>
+	
 	<select id="selectLeaveDayList" resultType="SapCheckReport">
 		SELECT * from sap_check_report where result = '异常' and leaveDay is not null 
 			and checkinDay >= #{startDay} and checkinDay &lt;= #{endDay}

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

@@ -31,14 +31,14 @@ public class CheckTaskService {
 			if (DateUtil.getHour().equals("10") || DateUtil.getHour().equals("12") || DateUtil.getHour().equals("20")
 					|| DateUtil.getHour().equals("23")) {
 				LoggerUtil.info("执行开始:" + DateUtil.getTime());
-				executeBiz(DateUtil.getDay());
+				executeBiz(DateUtil.getDay(), DateUtil.getHour());
 				LoggerUtil.info("执行结束:" + DateUtil.getTime());
 			}
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 			try {
 				LoggerUtil.info("重试执行开始:" + DateUtil.getTime());
-				executeBiz(DateUtil.getDay());
+				executeBiz(DateUtil.getDay(), DateUtil.getHour());
 				LoggerUtil.info("重试执行结束:" + DateUtil.getTime());
 			} catch (Exception ex) {
 				LoggerUtil.error(ex);
@@ -46,7 +46,7 @@ public class CheckTaskService {
 		}
 	}
 
-	public void executeBiz(String checkinDay) throws Exception {
+	public void executeBiz(String checkinDay, String hour) throws Exception {
 		String startDay = checkinDay;
 		String endDay = checkinDay;
 		wxDepartService.saveWxDeparts();
@@ -69,7 +69,7 @@ public class CheckTaskService {
 		LoggerUtil.info("saveApprovalInfos:" + DateUtil.getTime());
 		sapCheckService.saveReportResultData(startDay, endDay);
 		LoggerUtil.info("saveReportResultData:" + DateUtil.getTime());
-		sapCheckService.updateReportResultData(startDay, endDay);
+		sapCheckService.updateReportResultData(startDay, endDay, hour);
 		LoggerUtil.info("updateReportResultData:" + DateUtil.getTime());
 	}
 }

+ 5 - 2
code/sapparent/sapservice/src/main/java/org/fouram/service/SapCheckService.java

@@ -138,10 +138,11 @@ public class SapCheckService extends BaseService {
 		update("SapCheckMapper.deleteCheckReport", param);
 		update("SapCheckMapper.saveCheckReport", param);
 	}
-	
+
 	@SuppressWarnings("unchecked")
-	public void updateReportResultData(String startDay, String endDay) throws Exception {
+	public void updateReportResultData(String startDay, String endDay, String hour) throws Exception {
 		Map<String, String> param = Maps.newHashMap();
+		param.put("hour", hour);
 		param.put("startDay", startDay);
 		param.put("endDay", endDay);
 		param.put("startDayT", startDay.replace("-", ""));
@@ -171,6 +172,8 @@ public class SapCheckService extends BaseService {
 		update("SapCheckMapper.updateResultOkByAllBuKa", null);
 		// 查询有请假情况的数据-更新为正常
 		update("SapCheckMapper.updateResultOkByAllLeave", null);
+		// 更新hour字段
+		update("SapCheckMapper.updateAllHour", param);
 	}
 
 	// 是不是正确的上班时间