From d1be5661ae7221865914a75d52d827b6f32f846f Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Fri, 21 Mar 2025 22:09:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java  | 4 ++--
 .../ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
index 70be2d7..1eba9a4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
@@ -459,7 +459,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
 		BgtAttendanceVO bgtAttendanceVO = new BgtAttendanceVO();
 		FbsProjectTask task = taskService.getById(dto.getTaskId());
 
-		validTaskTime(task, dto.getDate());
+//		validTaskTime(task, dto.getDate());
 
 		bgtAttendanceVO.setTaskId(task.getId());
 		bgtAttendanceVO.setTaskName(task.getTaskName());
@@ -513,7 +513,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
 	@Override
 	public List<BgtDayAttendanceCountVO> histogram(BgtAttendanceDTO dto) {
 		FbsProjectTask task = taskService.getById(dto.getTaskId());
-		validTaskTime(task, dto.getDate());
+//		validTaskTime(task, dto.getDate());
 
 		LocalDate taskEndTime = DateUtils.str2Localdate(task.getTaskEndTime(), DateUtils.YYYY_MM_DD);
 		LocalDate date = dto.getDate();
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 6a065fd..205dfb8 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
@@ -461,6 +461,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
 	public BigDecimal getPayByTaskAndBgt(Long taskId,Long auditorUserId) {
 
 		List<WgzPayCalculation> list = list(Wrappers.<WgzPayCalculation>lambdaQuery().eq(WgzPayCalculation::getTaskId, taskId)
+			.eq(WgzPayCalculation::getAuditorType, "2")
 			.eq(WgzPayCalculation::getAuditorUserId, auditorUserId));
 		return list.stream().map(WgzPayCalculation::getRecruitAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 	}