liupeng 4 年之前
父节点
当前提交
2f52321171

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

@@ -78,11 +78,11 @@ public class CheckTaskSchedule {
 		LoggerUtil.info("saveOptions:" + DateUtil.getTime());
 		wxApprovalInfoService.saveApprovalInfos(endDay.substring(0, 7));
 		LoggerUtil.info("saveApprovalInfos:" + DateUtil.getTime());
-		boolean isSpecialCheckinDay = true;
+		boolean specialCheckinDay = false;
 		if (checkInTotal < 50) {
-			isSpecialCheckinDay = false;
+			specialCheckinDay = true;
 		}
-		wxCheckService.saveReportResultData(startDay, endDay, isSpecialCheckinDay);
+		wxCheckService.saveReportResultData(startDay, endDay, specialCheckinDay);
 		LoggerUtil.info("saveReportResultData:" + DateUtil.getTime());
 		wxCheckService.updateReportResultData(startDay, endDay, hour);
 		LoggerUtil.info("updateReportResultData:" + DateUtil.getTime());

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

@@ -62,7 +62,7 @@
 		select a.userId,c.groupName,a.`name`,b.checkinDay,c.checkinDate,c.exceptionType,d.checkinDate,d.exceptionType,
 			e.checkinDate,g.checkinDate,f.createdDateTime,f.startDate,f.endDate,f.deductionQuantity,f.`comment`
 		from wx_user a 
-		<if test="isSpecialCheckinDay">
+		<if test="specialCheckinDay">
 			join sap_checkin cc on a.userId = cc.userId 
 		</if>
 		join sap_checkdate b on a.delFlag = 0 and b.checkinDay >= #{startDay} and b.checkinDay &lt;= #{endDay}

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

@@ -125,13 +125,13 @@ public class WxCheckService extends BaseService {
 		}
 	}
 
-	public void saveReportResultData(String startDay, String endDay, boolean isSpecialCheckinDay) throws Exception {
+	public void saveReportResultData(String startDay, String endDay, boolean specialCheckinDay) throws Exception {
 		Map<String, Object> param = Maps.newHashMap();
 		param.put("startDay", startDay);
 		param.put("endDay", endDay);
 		param.put("startDayT", startDay.replace("-", ""));
 		param.put("endDayT", endDay.replace("-", ""));
-		param.put("isSpecialCheckinDay", isSpecialCheckinDay);
+		param.put("specialCheckinDay", specialCheckinDay);
 
 		// 生成报表数据
 		update("SapCheckMapper.deleteCheckReport", param);