From aa5915b4e7d5bdb24061e75f13fa0fa827f0f325 Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Wed, 21 Feb 2024 10:25:39 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EA=B0=81=20/=20=EC=A1=B0=EA=B8=B0?=
 =?UTF-8?q?=ED=87=B4=EA=B7=BC=20=EC=B2=B4=ED=81=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itn/commute/mapper/domain/CommuteVO.java  |  4 ++
 .../service/impl/CommuteServiceImpl.java      | 44 ++++++++++++++++++-
 .../resources/templates/commute/list.html     |  6 +++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/itn/admin/itn/commute/mapper/domain/CommuteVO.java b/src/main/java/com/itn/admin/itn/commute/mapper/domain/CommuteVO.java
index 5ff3f89..049de3d 100644
--- a/src/main/java/com/itn/admin/itn/commute/mapper/domain/CommuteVO.java
+++ b/src/main/java/com/itn/admin/itn/commute/mapper/domain/CommuteVO.java
@@ -53,6 +53,10 @@ public class CommuteVO implements Serializable {
     private String firstActivityTime;
     private String lastActivityTime;
 
+    private String firstActivityTimeMemo;
+    private String lastActivityTimeMemo;
+
+
     private String startDate;
     private String endDate;
 
diff --git a/src/main/java/com/itn/admin/itn/commute/service/impl/CommuteServiceImpl.java b/src/main/java/com/itn/admin/itn/commute/service/impl/CommuteServiceImpl.java
index 649cc5a..ba540a9 100644
--- a/src/main/java/com/itn/admin/itn/commute/service/impl/CommuteServiceImpl.java
+++ b/src/main/java/com/itn/admin/itn/commute/service/impl/CommuteServiceImpl.java
@@ -73,8 +73,14 @@ public class CommuteServiceImpl implements CommuteService {
         }
 
         commuteList.stream().forEach(t->{
+            System.out.println(t.getFirstActivityTime());
+
+
+            t.setFirstActivityTimeMemo(this.getLateChk(t.getFirstActivityTime()));
+            t.setLastActivityTimeMemo(this.getLeaveWorkEarly(t.getLastActivityTime()));
+
+
             if(StringUtils.isNotEmpty(t.getUsrid())){
-                System.out.println("t.getUsrid() :: "+ t.getUsrid());
                 try {
                     t.setUsrid(UserEnum.valueOfLabel(t.getUsrid()).userName());
                 }catch (Exception e){
@@ -90,4 +96,40 @@ public class CommuteServiceImpl implements CommuteService {
         return map;
     }
 
+    private String getLeaveWorkEarly(String p_lastActivityTime) {
+        // DateTimeFormatter를 사용하여 String을 LocalDateTime으로 파싱
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime firstActivityTime = LocalDateTime.parse(p_lastActivityTime, formatter);
+
+        // 체크하고자 하는 시간 설정 (09:30)
+        LocalTime checkTime = LocalTime.of(18, 30);
+
+        // firstActivityTime의 시간 부분만 추출
+        LocalTime activityTime = firstActivityTime.toLocalTime();
+
+        // activityTime이 checkTime보다 이후인지 확인
+        if (activityTime.isBefore(checkTime)) {
+            return "조기퇴근";
+        }
+        return "";
+    }
+
+    private static String getLateChk(String p_firstActivityTime) {
+        // DateTimeFormatter를 사용하여 String을 LocalDateTime으로 파싱
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime firstActivityTime = LocalDateTime.parse(p_firstActivityTime, formatter);
+
+        // 체크하고자 하는 시간 설정 (09:30)
+        LocalTime checkTime = LocalTime.of(9, 30);
+
+        // firstActivityTime의 시간 부분만 추출
+        LocalTime activityTime = firstActivityTime.toLocalTime();
+
+        // activityTime이 checkTime보다 이후인지 확인
+        if (activityTime.isAfter(checkTime)) {
+           return "지각";
+        }
+        return "";
+    }
+
 }
diff --git a/src/main/resources/templates/commute/list.html b/src/main/resources/templates/commute/list.html
index 00230c9..ae82e14 100644
--- a/src/main/resources/templates/commute/list.html
+++ b/src/main/resources/templates/commute/list.html
@@ -104,7 +104,9 @@
                                             <th></th>
                                             <th>Name</th>
                                             <th>출근</th>
+                                            <th>비고</th>
                                             <th>퇴근</th>
+                                            <th>비고</th>
                                         </tr>
                                         </thead>
                                         <tbody>
@@ -112,7 +114,9 @@
                                             <td th:text="${stat.count}"></td>
                                             <td th:text="${row.usrid}"></td>
                                             <td th:text="${row.firstActivityTime}"></td>
+                                            <td th:text="${row.firstActivityTimeMemo}"></td>
                                             <td th:text="${row.lastActivityTime}"></td>
+                                            <td th:text="${row.LastActivityTimeMemo}"></td>
                                         </tr>
                                         </tbody>
                                         <tfoot>
@@ -120,7 +124,9 @@
                                             <th></th>
                                             <th>Name</th>
                                             <th>출근</th>
+                                            <th>비고</th>
                                             <th>퇴근</th>
+                                            <th>비고</th>
                                         </tr>
                                         </tfoot>
                                     </table>