fix

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

@@ -66,8 +66,8 @@ public class CheckTaskSchedule {
 		wxCheckService.saveCheckInOffOuts(startDay, endDay);
 		LoggerUtil.info("saveCheckInOffOuts:" + DateUtil.getTime());
 		// 判断打卡记录小于10条记录认为是假期
-		System.out.println(wxCheckService.queryCheckInTotal());
-		if (wxCheckService.queryCheckInTotal() < 10) {
+		int checkInTotal = wxCheckService.queryCheckInTotal().intValue();
+		if (checkInTotal < 10) {
 			return;
 		}
 		sapCheckdateService.saveCheckdate(startDay);
@@ -78,7 +78,11 @@ public class CheckTaskSchedule {
 		LoggerUtil.info("saveOptions:" + DateUtil.getTime());
 		wxApprovalInfoService.saveApprovalInfos(endDay.substring(0, 7));
 		LoggerUtil.info("saveApprovalInfos:" + DateUtil.getTime());
-		wxCheckService.saveReportResultData(startDay, endDay);
+		boolean isSpecialCheckinDay = true;
+		if(checkInTotal < 50) {
+			isSpecialCheckinDay = false;
+		}
+		wxCheckService.saveReportResultData(startDay, endDay, isSpecialCheckinDay);
 		LoggerUtil.info("saveReportResultData:" + DateUtil.getTime());
 		wxCheckService.updateReportResultData(startDay, endDay, hour);
 		LoggerUtil.info("updateReportResultData:" + DateUtil.getTime());

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

@@ -61,8 +61,11 @@
 			checkoutDate1,checkoutDate2,leaveCreatedTime,leaveStartDate,leaveEndDate,leaveDay,leaveComment)
 		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 join sap_checkdate b on a.delFlag=0 
-			and b.checkinDay >= #{startDay} and b.checkinDay <= #{endDay}
+		from wx_user a 
+		<if test="isSpecialCheckinDay">
+			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}
 		LEFT JOIN sap_checkin c on a.userId = c.userId and b.checkinDay = c.checkinDay
 		LEFT JOIN sap_checkoff d on a.userId = d.userId and b.checkinDay = d.checkinDay
 		LEFT JOIN sap_checkout_start e on a.userId = e.userId and b.checkinDay = e.checkinDay
@@ -260,6 +263,6 @@
 	</update>
 	
 	<select id="queryCheckInTotal" resultType="Long">
-		SELECT count(1) from sap_checkin where groupName not like '华人影业-今涂%'
+		SELECT count(1) from sap_checkin 
 	</select>
 </mapper>

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

@@ -125,12 +125,13 @@ public class WxCheckService extends BaseService {
 		}
 	}
 
-	public void saveReportResultData(String startDay, String endDay) throws Exception {
-		Map<String, String> param = Maps.newHashMap();
+	public void saveReportResultData(String startDay, String endDay, boolean isSpecialCheckinDay) 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);
 
 		// 生成报表数据
 		update("SapCheckMapper.deleteCheckReport", param);
@@ -144,7 +145,7 @@ public class WxCheckService extends BaseService {
 		param.put("endDay", endDay);
 		param.put("startDayT", startDay.replace("-", ""));
 		param.put("endDayT", endDay.replace("-", ""));
-		
+
 		// 更新打卡规则时间
 		update("SapCheckMapper.updateWorkTime", param);
 		update("SapCheckMapper.updateOffWorkTime", param);
@@ -171,14 +172,14 @@ public class WxCheckService extends BaseService {
 		update("SapCheckMapper.updateRealCheckoffDate", param);
 		// 不需要下班打卡更新异常字段
 		update("SapCheckMapper.updateCheckoffExceptionByNoNeedOffwork", param);
-		//异常信息提示
-		//1.列“上班打卡异常信息”
-		//a.当“上班时间”为空，列“上班打卡时间”置为空值(现在会显示打卡规则时间)，提示“上班未打卡”
-		//b.当“上班时间”晚于打卡规则，提示“迟到”
-		//2.列“下班打卡异常信息”
-		//a.当“下班时间”为空，列“下班打卡时间”置为空值，提示“下班未打卡”
-		//b.当“下班时间”晚于打卡规则，提示“早退”
-		//增加列：“备注”，备注显示信息如下：符合多种状态逗号分割显示
+		// 异常信息提示
+		// 1.列“上班打卡异常信息”
+		// a.当“上班时间”为空，列“上班打卡时间”置为空值(现在会显示打卡规则时间)，提示“上班未打卡”
+		// b.当“上班时间”晚于打卡规则，提示“迟到”
+		// 2.列“下班打卡异常信息”
+		// a.当“下班时间”为空，列“下班打卡时间”置为空值，提示“下班未打卡”
+		// b.当“下班时间”晚于打卡规则，提示“早退”
+		// 增加列：“备注”，备注显示信息如下：符合多种状态逗号分割显示
 		update("SapCheckMapper.updateRealResultRemark", param);
 		update("SapCheckMapper.updateRealResult", param);
 		update("SapCheckMapper.updateRealResultRemarkOK", param);