From 4f0585a6dfa956ce00b4ebdfb2aca705a27e704c Mon Sep 17 00:00:00 2001
From: Zhangluo <643733581@qq.com>
Date: Mon, 2 Sep 2024 21:45:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81=E6=97=B6=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=91=A8=E5=BA=8F;2.=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84=E5=AD=A6=E4=B9=A0=E6=96=B9=E5=90=91=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sanyuankexie/attendance/common/DTO/UserStatusDTO.java | 1 +
 src/main/java/org/sanyuankexie/attendance/model/User.java | 2 ++
 .../attendance/service/AttendanceRecordService.java       | 8 ++++++++
 3 files changed, 11 insertions(+)

diff --git a/src/main/java/org/sanyuankexie/attendance/common/DTO/UserStatusDTO.java b/src/main/java/org/sanyuankexie/attendance/common/DTO/UserStatusDTO.java
index ec09ef0..00ec3c2 100644
--- a/src/main/java/org/sanyuankexie/attendance/common/DTO/UserStatusDTO.java
+++ b/src/main/java/org/sanyuankexie/attendance/common/DTO/UserStatusDTO.java
@@ -7,4 +7,5 @@ public class UserStatusDTO {
     private Long userId;
     private String userName;
     private Integer status;
+    private Integer week;
 }
diff --git a/src/main/java/org/sanyuankexie/attendance/model/User.java b/src/main/java/org/sanyuankexie/attendance/model/User.java
index 1f43937..013060b 100644
--- a/src/main/java/org/sanyuankexie/attendance/model/User.java
+++ b/src/main/java/org/sanyuankexie/attendance/model/User.java
@@ -21,4 +21,6 @@ public class User {
     private   String githubId;
     @ExcelProperty("年级(例如：22级填22)")
     private String grade;
+    @ExcelProperty("方向")
+    private String learn;
 }
diff --git a/src/main/java/org/sanyuankexie/attendance/service/AttendanceRecordService.java b/src/main/java/org/sanyuankexie/attendance/service/AttendanceRecordService.java
index d65677a..9316e78 100644
--- a/src/main/java/org/sanyuankexie/attendance/service/AttendanceRecordService.java
+++ b/src/main/java/org/sanyuankexie/attendance/service/AttendanceRecordService.java
@@ -5,8 +5,10 @@
 import org.sanyuankexie.attendance.common.DTO.UserStatusEnum;
 import org.sanyuankexie.attendance.common.exception.CExceptionEnum;
 import org.sanyuankexie.attendance.common.exception.ServiceException;
+import org.sanyuankexie.attendance.common.helper.TimeHelper;
 import org.sanyuankexie.attendance.mapper.AttendanceRecordMapper;
 import org.sanyuankexie.attendance.model.AttendanceRecord;
+import org.sanyuankexie.attendance.model.SystemInfo;
 import org.sanyuankexie.attendance.model.User;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -30,6 +32,11 @@ public class AttendanceRecordService {
     @Value("${attendance.term}")
     private String term;
 
+    private final TimeHelper timeHelper;
+
+    public AttendanceRecordService(TimeHelper timeHelper, SystemInfo systemInfo) {
+        this.timeHelper = timeHelper;
+    }
 
     DecimalFormat dft = new DecimalFormat("0.00");
 
@@ -102,6 +109,7 @@ public UserStatusDTO isOnlineByUserId(Long userId) {
             userStatusDTO.setUserId(user.getId());
             userStatusDTO.setStatus(UserStatusEnum.OFFLINE.getStatus());
             userStatusDTO.setUserName(user.getName());
+            userStatusDTO.setWeek(timeHelper.getNowWeek());
             return userStatusDTO;
         }
     }