From 8effac832a88cd7c04b221345a6b493e523705bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Tue, 1 Apr 2025 15:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=8A=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WgzDailyClockServiceImpl.java        | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java
index d12ed41..fd946e2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java
@@ -33,14 +33,12 @@ import com.ruoyi.wgz.bo.res.WgzAppCheckDailyNewspaperRes;
 import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes;
 import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes;
 import com.ruoyi.wgz.bo.rests.WgzAppAttachmentAcquisitionTwo;
+import com.ruoyi.wgz.domain.WgzAttendance;
 import com.ruoyi.wgz.domain.WgzDailyClock;
 import com.ruoyi.wgz.domain.WgzMessage;
 import com.ruoyi.wgz.domain.WgzUser;
 import com.ruoyi.wgz.mapper.WgzDailyClockMapper;
-import com.ruoyi.wgz.service.IWgzDailyClockService;
-import com.ruoyi.wgz.service.IWgzLeaveService;
-import com.ruoyi.wgz.service.IWgzMessageService;
-import com.ruoyi.wgz.service.IWgzUserService;
+import com.ruoyi.wgz.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -91,6 +89,9 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
 	@Autowired
 	private IBgtMessageService iBgtMessageService;
 
+	@Autowired
+	private IWgzAttendanceService iWgzAttendanceService;
+
     @Override
     public WgzDailyClock queryById(Long id){
         return getById(id);
@@ -209,6 +210,17 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
 				}
 			}
 		});
+		//5、数据补充：根据第一次打卡数据来存储到fh里面提供后面逻辑的数据支持
+		LambdaQueryWrapper<WgzAttendance> apply1 = new LambdaQueryWrapper<WgzAttendance>()
+			.eq(WgzAttendance::getApplyKey, by.getId())
+			.eq(WgzAttendance::getUserId, appUserId)
+			.orderByAsc(WgzAttendance::getId)
+			.last("limit 1");
+		WgzAttendance one1 = iWgzAttendanceService.getOne(apply1);
+		if (one1 != null) {
+			LocalDate date = one1.getDate();
+			fh.put(date.toString(),new WgzAppAttachmentAcquisitionTwo().setStatus("1"));
+		}
 		//5、查看fh的key最大和最小的日期之间差哪些日期，然后补齐数据
 		LocalDate minDate = fh.keySet().stream().map(LocalDate::parse).min(LocalDate::compareTo).orElse(null);
 		LocalDate now = LocalDate.now();