From 06ee3738f6d85c9e017d4c4aaaa7d943afcac0fb Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Wed, 18 Mar 2026 08:55:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=AF=A6=E6=83=85=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/vo/RzAttendanceDetailTimeLineVO.java           | 8 +++++---
 .../service/impl/RzAttendanceDetailServiceImpl.java       | 8 +++++++-
 .../mapper/attendance/RzAttendanceDetailMapper.xml        | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/evo-admin/src/main/java/com/evo/attendance/domain/vo/RzAttendanceDetailTimeLineVO.java b/evo-admin/src/main/java/com/evo/attendance/domain/vo/RzAttendanceDetailTimeLineVO.java
index d86f672..8644cd9 100644
--- a/evo-admin/src/main/java/com/evo/attendance/domain/vo/RzAttendanceDetailTimeLineVO.java
+++ b/evo-admin/src/main/java/com/evo/attendance/domain/vo/RzAttendanceDetailTimeLineVO.java
@@ -27,6 +27,8 @@ public class RzAttendanceDetailTimeLineVO {
 
     String size = "large";
 
+    String delFlag;
+
     public RzAttendanceDetailTimeLineVO(String content, String photo, String timestamp, String delFlag) {
         this.content = content;
         this.photo = photo;
@@ -36,7 +38,7 @@ public class RzAttendanceDetailTimeLineVO {
         this.icon = timeLine.icon;
     }
 
-    enum TimeLineEnum{
+    public enum TimeLineEnum{
         UP("上班", "primary","el-icon-caret-top"),
         OVERTIME("加班", "success","el-icon-plus"),
         DOWN("下班", "warning","el-icon-caret-bottom"),
@@ -46,8 +48,8 @@ public class RzAttendanceDetailTimeLineVO {
         ;
 
         String typeWork;
-        String type;
-        String icon;
+        public String type;
+        public String icon;
 
         TimeLineEnum(String typeWork, String type, String icon) {
             this.typeWork = typeWork;
diff --git a/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceDetailServiceImpl.java b/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceDetailServiceImpl.java
index ca984a5..1beca89 100644
--- a/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceDetailServiceImpl.java
+++ b/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceDetailServiceImpl.java
@@ -134,7 +134,13 @@ public class RzAttendanceDetailServiceImpl extends ServiceImpl<RzAttendanceDetai
 
     @Override
     public List<RzAttendanceDetailTimeLineVO> selectListByAttendanceId(Long attId) {
-        return getBaseMapper().selectListByAttendanceId(attId);
+        List<RzAttendanceDetailTimeLineVO> result = getBaseMapper().selectListByAttendanceId(attId);
+        result.stream().forEach(data->{
+            RzAttendanceDetailTimeLineVO.TimeLineEnum timeLine = RzAttendanceDetailTimeLineVO.TimeLineEnum.get(data.getContent(), data.getDelFlag());
+            data.setType(timeLine.type);
+            data.setIcon(timeLine.icon);
+        });
+        return result;
 //
 //        return getBaseMapper().selectListByAttendanceId(new LambdaQueryWrapper<RzAttendanceDetail>().eq(RzAttendanceDetail::getAttendanceId, attId)
 //        .select(RzAttendanceDetail::getButtonType, RzAttendanceDetail::getPhoto, RzAttendanceDetail::getDateTime,RzAttendanceDetail::getDelFlag)).stream().map(data ->{
diff --git a/evo-admin/src/main/resources/mapper/attendance/RzAttendanceDetailMapper.xml b/evo-admin/src/main/resources/mapper/attendance/RzAttendanceDetailMapper.xml
index 25003c8..1f7485c 100644
--- a/evo-admin/src/main/resources/mapper/attendance/RzAttendanceDetailMapper.xml
+++ b/evo-admin/src/main/resources/mapper/attendance/RzAttendanceDetailMapper.xml
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectListByAttendanceId" resultType="com.evo.attendance.domain.vo.RzAttendanceDetailTimeLineVO">
-        select ad.button_type, ad.date_time, ad.del_flag,ap.photo
+        select ad.button_type as content, DATE_FORMAT(ad.date_time,"%Y-%m-%d %H:%i:%s")  as `timestamp`, ad.del_flag as delFlag , ap.photo
         from rz_attendance_detail ad
         left join rz_attendance_photo ap on ap.attendance_detail_id = ad.id
         where ad.attendance_id = #{attId}