fix

code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -241,7 +241,8 @@ public class ApiController extends BaseController {
 			String endDate = getPageData().getString("endDate");
 			String departId = getPageData().getString("departId");
 			String name = getPageData().getString("name");
-			return AppUtil.success(sapCheckService.findUserReports(startDate, endDate, departId, name), null);
+			String state = getPageData().getString("state");
+			return AppUtil.success(sapCheckService.findUserReports(startDate, endDate, departId, name, state), null);
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
@@ -257,7 +258,8 @@ public class ApiController extends BaseController {
 			String endDate = getPageData().getString("endDate");
 			String departId = getPageData().getString("departId");
 			String name = getPageData().getString("name");
-			Object object = sapCheckService.findUserReports(startDate, endDate, departId, name);
+			String state = getPageData().getString("state");
+			Object object = sapCheckService.findUserReports(startDate, endDate, departId, name, state);
 			List<Map<String, Object>> dataList = (List<Map<String, Object>>) object;
 			String haveFilePath = "/public/excel/userReport.xlsx";
 			ExcelExportUtil.exportExcelStream(getRootPath() + haveFilePath, dataList, 1, response);

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

@@ -92,16 +92,6 @@
 			and checkinDay >= #{startDay} and checkinDay <= #{endDay}
 	</update>
 
-	<update id="updateCheckinException">
-		update sap_check_report set checkinException = '未打卡后台更新' where checkinDate is null 
-			and checkinDay >= #{startDay} and checkinDay &lt;= #{endDay}
-	</update>
-	
-	<update id="updateCheckoffException">
-		update sap_check_report set checkoffException = '未打卡后台更新' where checkoffDate is null
-			and checkinDay >= #{startDay} and checkinDay &lt;= #{endDay}
-	</update>
-
 	<update id="updateAllExceptionResult">
 		update sap_check_report set result = '异常' 
 		where (LENGTH(checkinException) > 0 or LENGTH(checkoffException) > 0) and result = '正常' 
@@ -176,6 +166,9 @@
 		<if test="name != null and name != ''">
 			and a.name like CONCAT(CONCAT('%', #{name}),'%')
 		</if>
+		<if test="state != null and state != ''">
+			and a.result = #{state} 
+		</if>
 		order by a.userId, a.checkinDay 
 	</select>
 </mapper>

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

@@ -120,8 +120,9 @@ public class SapCheckService extends BaseService {
 				update("SapCheckMapper.deleteCheckoutEndById", sapCheck);
 			}
 		}
-		
-		List<SapEmployeeTime> employeeTimes = (List<SapEmployeeTime>) findList("SapEmployeeTimeMapper.selectRepeat", null);
+
+		List<SapEmployeeTime> employeeTimes = (List<SapEmployeeTime>) findList("SapEmployeeTimeMapper.selectRepeat",
+				null);
 		checkinDays = Sets.newHashSet();
 		for (SapEmployeeTime sapCheck : employeeTimes) {
 			if (!checkinDays.contains(sapCheck.getStartDate() + sapCheck.getUserId())) {
@@ -145,9 +146,6 @@ public class SapCheckService extends BaseService {
 		update("SapCheckMapper.saveCheckReport", param);
 		// 更新华人时代人员上班时间可以推迟30分钟
 		update("SapCheckMapper.updateHrsdWorkTime", param);
-		// 更新当前未打卡情况，未更新微信端应该是晚上才更新的
-//		update("SapCheckMapper.updateCheckinException", param);
-//		update("SapCheckMapper.updateCheckoffException", param);
 		// 更新所有异常事件的数据为异常数据
 		update("SapCheckMapper.updateAllExceptionResult", param);
 		// 查询有请假情况的数据
@@ -162,7 +160,7 @@ public class SapCheckService extends BaseService {
 				}
 			}
 		}
-
+		// 获取异常数据，更新部分符合条件的正常
 		checkReports = (List<SapCheckReport>) findList("SapCheckMapper.selectExceptionList", null);
 		for (SapCheckReport checkReport : checkReports) {
 			if (isOkWorkTime(checkReport) || isOkOffWorkTime(checkReport)
@@ -170,8 +168,6 @@ public class SapCheckService extends BaseService {
 				update("SapCheckMapper.updateResultOk", checkReport.getId());
 			}
 		}
-		update("SapCheckMapper.dropCheckReportUser", param);
-		update("SapCheckMapper.saveCheckReportUser", param);
 	}
 
 	// 是不是正确的上班时间
@@ -214,15 +210,24 @@ public class SapCheckService extends BaseService {
 		return false;
 	}
 
-	public Object findUserReports(String startDate, String endDate, String departId, String name) throws Exception {
-		if(StringUtils.isNotBlank(departId) && departId.endsWith(",")) {
+	public Object findUserReports(String startDate, String endDate, String departId, String name, String state)
+			throws Exception {
+		if (StringUtils.isNotBlank(departId) && departId.endsWith(",")) {
 			departId = departId.substring(0, departId.length() - 1);
 		}
+		if (StringUtils.isNotBlank(state)) {
+			if ("1".equals(state)) {
+				state = "正常";
+			} else {
+				state = "异常";
+			}
+		}
 		Map<String, String> pd = Maps.newHashMap();
 		pd.put("startDate", startDate);
 		pd.put("endDate", endDate);
 		pd.put("departId", departId);
 		pd.put("name", name);
+		pd.put("state", state);
 		return findList("SapCheckMapper.findUserReports", pd);
 	}
 }