From b23816c35c10ac7f59d44771227c277a32ecd6aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Thu, 20 Mar 2025 18:47:02 +0800
Subject: [PATCH] 111

---
 .../service/impl/WgzPayCalculationServiceImpl.java  | 13 +++++++++++--
 .../service/impl/WgzReissueacardServiceImpl.java    |  8 ++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
index 4f04fc6..5146555 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
@@ -488,11 +488,20 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
 			.last("limit 1"));
 		vo.setEntryTime(apply.getEntryTime());
 
-		Integer i = attendanceService.attendanceDetail(userId, recruitId, null);
+		int i = iWgzAttendanceService.count(
+			new LambdaQueryWrapper<WgzAttendance>().
+				eq(WgzAttendance::getUserId, userId).
+				eq(WgzAttendance::getRecruitId,recruitId).and(wrapper -> wrapper
+					.isNotNull(WgzAttendance::getClockInTime)
+					.or()
+					.isNotNull(WgzAttendance::getClockOutTime)
+				)
+		);
+//		Integer i = attendanceService.attendanceDetail(userId, recruitId, null);
 		BigDecimal totalAmount = recruit.getRecruitAmount().multiply(BigDecimal.valueOf(i));
 		vo.setAllAmount(totalAmount);
 
-		List<WgzPayCalculation> gzs = findByUserIdRecruitIdNewestData(userId, apply.getId());
+		List<WgzPayCalculation> gzs = findByUserIdRecruitIdNewestData(userId, recruitId);
 		BigDecimal addSum = new BigDecimal(0);
 		for (WgzPayCalculation gz : gzs) {
 			//金额*天数=实际工资
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java
index 9e98fdb..9cb9dc2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java
@@ -254,8 +254,8 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
 				exceptionType = exceptionType.replace("\\b1\\b", "5");
 				exceptionType = exceptionType.replace("\\b3\\b", "5");
 				attendance.setExceptionType(exceptionType);
-				attendance.setLate(1);
-				attendance.setMissedIn(1);
+				attendance.setLate(0);
+				attendance.setMissedIn(0);
 				if(attendance.getClockInTime() == null){
 					attendance.setClockInTime(byId.getNowTime());
 				}
@@ -263,8 +263,8 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
 				exceptionType = exceptionType.replace("\\b2\\b", "6");
 				exceptionType = exceptionType.replace("\\b4\\b", "6");
 				attendance.setExceptionType(exceptionType);
-				attendance.setEarlyLeave(1);
-				attendance.setMissedOut(1);
+				attendance.setEarlyLeave(0);
+				attendance.setMissedOut(0);
 				if(attendance.getClockOutTime() == null){
 					attendance.setClockOutTime(byId.getNowTime());
 				}