fix

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

@@ -105,7 +105,7 @@
 	<update id="updateResultOkByAllBuKa">
 		update sap_check_report a, sap_approval_info b 
 		set a.result = '正常', a.bukaDay = b.`day`
-		where a.checkinDay = b.`day` and a.userId = b.userId;
+		where a.checkinDay = b.`day` and a.userId = b.userId and a.result = '异常'
 	</update>
 	
 	<update id="updateResultOkByAllLeave">

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

@@ -10,7 +10,6 @@ import org.fouram.core.base.service.BaseService;
 import org.fouram.core.plugin.weixin.cp.util.WXCpOaUtil;
 import org.fouram.core.util.BeanUtils;
 import org.fouram.core.util.DateUtil;
-import org.fouram.core.util.Tools;
 import org.fouram.entity.SapCheck;
 import org.fouram.entity.SapCheckReport;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -155,20 +154,12 @@ public class SapCheckService extends BaseService {
 		update("SapCheckMapper.updateCheckoffNullException", param);
 		// 更新所有异常事件的数据为异常数据
 		update("SapCheckMapper.updateAllExceptionResult", param);
-		// 查询有请假情况的数据
+		// 查询有请假情况的数据-更新为正常
 		List<SapCheckReport> checkReports = (List<SapCheckReport>) findList("SapCheckMapper.selectLeaveDayList", param);
 		for (SapCheckReport checkReport : checkReports) {
-			if (Tools.isInteger(checkReport.getLeaveDay())) {
-				update("SapCheckMapper.updateResultOk", checkReport.getId());
-			} else {
-				// 0.5
-				if (isOkWorkTime(checkReport) || isOkOffWorkTime(checkReport)
-						|| StringUtils.isNotBlank(checkReport.getBukaDay())) {
-					update("SapCheckMapper.updateResultOk", checkReport.getId());
-				}
-			}
+			update("SapCheckMapper.updateResultOk", checkReport.getId());
 		}
-		// 获取异常数据，更新部分符合条件的正常
+		// 上班和下班正常打卡一次或者有补卡符合一个条件-更新为正常
 		checkReports = (List<SapCheckReport>) findList("SapCheckMapper.selectExceptionList", param);
 		for (SapCheckReport checkReport : checkReports) {
 			if (isOkWorkTime(checkReport) || isOkOffWorkTime(checkReport)
@@ -176,11 +167,9 @@ public class SapCheckService extends BaseService {
 				update("SapCheckMapper.updateResultOk", checkReport.getId());
 			}
 		}
-		
 		// 更新所有有补卡日期的记录为正常
 		update("SapCheckMapper.updateResultOkByAllBuKa", null);
-		
-		// 请假状态会后期调整，需要针对请假通过更新为正常
+		// 查询有请假情况的数据-更新为正常
 		update("SapCheckMapper.updateResultOkByAllLeave", null);
 	}