fix

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

@@ -164,12 +164,12 @@
 	<update id="updateRealResult">
 		update sap_check_report
 		set realResult = (
-			case when length(realResultRemark) = 0 or leaveDay >= 1 
-					or (leaveDay = 0.5 and (
+			case when length(realResultRemark) = 0 then '正常'
+				 when leaveDay >= 1 or (leaveDay = 0.5 and (
 							(realCheckinDate != '' and left(realCheckinDate, 16) &lt;= concat(checkinDay,' 0', workTime))
 							or
 							(realCheckoffDate != '' and left(realCheckoffDate, 16) >= concat(checkinDay,' 0', offWorkTime))
-					)) then '正常' else '异常' 
+					)) then '已申请休假' else '异常' 
 			end)
 		where realResult is null
 	</update>
@@ -178,6 +178,10 @@
 		update sap_check_report set realResultRemark = '' where realResult = '正常'
 	</update>
 	
+	<update id="updateRealResultRemarkLeave">
+		update sap_check_report set realResultRemark = '已申请休假', realResult = '正常' where realResult = '已申请休假'
+	</update>
+	
 	<update id="updateWorkMins">
 		update sap_check_report
 		set workMins = (

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

@@ -194,6 +194,7 @@ public class WxCheckService extends BaseService {
 		update("SapCheckMapper.updateRealResultRemark", null);
 		update("SapCheckMapper.updateRealResult", null);
 		update("SapCheckMapper.updateRealResultRemarkOK", null);
+		update("SapCheckMapper.updateRealResultRemarkLeave", null);
 		// 更新工作时间（分钟）
 		update("SapCheckMapper.updateWorkMins", null);
 	}