liupeng 4 سال پیش
والد
کامیت
08ee72a7b0

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

@@ -98,7 +98,14 @@
 	</update>
 
 	<update id="updateResultOk">
-		update sap_check_report set result = '正常' where id = #{id}
+		update sap_check_report set result = '正常' 
+		where id = #{id}
+	</update>
+	
+	<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;
 	</update>
 	
 	<select id="selectLeaveDayList" resultType="SapCheckReport">

+ 4 - 1
code/sapparent/sapservice/src/main/java/org/fouram/service/SapCheckService.java

@@ -150,7 +150,7 @@ public class SapCheckService extends BaseService {
 
 		// 更新华人时代人员上班时间可以推迟30分钟
 		update("SapCheckMapper.updateHrsdWorkTime", param);
-		// 更新时间为空的为后台更新未打
+		// 更新时间为空的为后台更新未打
 		update("SapCheckMapper.updateCheckinNullException", param);
 		update("SapCheckMapper.updateCheckoffNullException", param);
 		// 更新所有异常事件的数据为异常数据
@@ -176,6 +176,9 @@ public class SapCheckService extends BaseService {
 				update("SapCheckMapper.updateResultOk", checkReport.getId());
 			}
 		}
+		
+		// 更新所有有补卡日期的记录为正常
+		update("SapCheckMapper.updateResultOkByAllBuKa", null);
 	}
 
 	// 是不是正确的上班时间