保存打卡记录的时候 保存考勤组名称字段

zs-manager/src/main/java/com/ruoyi/zhushi/entity/DkAttendanceGroupAndUser.java

@@ -25,4 +25,9 @@ public class DkAttendanceGroupAndUser extends BaseEntity {
     @TableField(value = "`dept_name`")
     private String deptName;
 
+    @TableField(value = "`nick_name`")
+    private String nickName;
+
+        @TableField(value = "`attendance_group_name`")
+    private String AttendanceGroupName;
 }

zs-manager/src/main/java/com/ruoyi/zhushi/entity/DkAttendanceGroupAndUserDTO.java

@@ -1,17 +1,33 @@
 package com.ruoyi.zhushi.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 
 @Data
 public class DkAttendanceGroupAndUserDTO extends BaseEntity {
 
+
     private int id;
 
 
-    private int attendanceTeamId;
+    private long attendanceTeamId;
+
+
+    private long userId;
+
+
+    private String userName;
+
+
+    private String deptName;
+
+
+    private String nickName;
 
 
-    private int configId;
+    private String AttendanceGroupName;
 
 }

zs-manager/src/main/java/com/ruoyi/zhushi/entity/DkCheckInRecord.java

@@ -74,4 +74,12 @@ public class DkCheckInRecord  extends BaseEntity {
     // 描述
     @TableField(value = "`description`")
     private String description;
+
+    // 考勤组id
+    @TableField(value = "`attendance_group_id`")
+    private long attendanceGroupId;
+
+    // 考勤组名称
+    @TableField(value = "`attendance_group_name`")
+    private String attendanceGroupName;
 }

zs-manager/src/main/java/com/ruoyi/zhushi/entity/DkCheckInRecordDTO.java

@@ -63,4 +63,10 @@ public class DkCheckInRecordDTO extends BaseEntity {
 
     // 模版类型
     private String modelType;
+
+    // 考勤组id
+    private String attendanceGroupId;
+
+    // 考勤组名称
+    private String attendanceGroupName;
 }

zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkAppServiceImpl.java

@@ -81,6 +81,9 @@ public class DkAppServiceImpl implements DkAppService {
                     dkCheckInRecord.setWeek(appDTO.getWeek());
                     dkCheckInRecord.setDay(appDTO.getDay());
                     dkCheckInRecord.setDescription(appDTO.getDescription());
+                    dkCheckInRecord.setAttendanceGroupId(appDTO.getAttendanceGroupId());
+                    dkCheckInRecord.setAttendanceGroupName(appDTO.getAttendanceGroupName());
+
                     dkRecordMapper.insert(dkCheckInRecord);
                     return "迟到打卡";
                 }
@@ -101,6 +104,8 @@ public class DkAppServiceImpl implements DkAppService {
                 dkCheckInRecord.setWeek(appDTO.getWeek());
                 dkCheckInRecord.setDay(appDTO.getDay());
                 dkCheckInRecord.setDescription(appDTO.getDescription());
+                dkCheckInRecord.setAttendanceGroupId(appDTO.getAttendanceGroupId());
+                dkCheckInRecord.setAttendanceGroupName(appDTO.getAttendanceGroupName());
                 dkRecordMapper.insert(dkCheckInRecord);
                 return "打卡成功";
             }else{
@@ -120,6 +125,8 @@ public class DkAppServiceImpl implements DkAppService {
                 dkCheckInRecord.setWeek(appDTO.getWeek());
                 dkCheckInRecord.setDay(appDTO.getDay());
                 dkCheckInRecord.setDescription(appDTO.getDescription());
+                dkCheckInRecord.setAttendanceGroupId(appDTO.getAttendanceGroupId());
+                dkCheckInRecord.setAttendanceGroupName(appDTO.getAttendanceGroupName());
                 dkRecordMapper.insert(dkCheckInRecord);
                 return "迟到打卡";
             }
@@ -142,6 +149,8 @@ public class DkAppServiceImpl implements DkAppService {
         dkCheckInRecord.setWeek(appDTO.getWeek());
         dkCheckInRecord.setDay(appDTO.getDay());
         dkCheckInRecord.setDescription(appDTO.getDescription());
+        dkCheckInRecord.setAttendanceGroupId(appDTO.getAttendanceGroupId());
+        dkCheckInRecord.setAttendanceGroupName(appDTO.getAttendanceGroupName());
         dkRecordMapper.insertOrUpdate(dkCheckInRecord);
         return "打卡成功";
     }
@@ -224,6 +233,8 @@ public class DkAppServiceImpl implements DkAppService {
                     dkCheckInRecord.setClockOutStatus("5");
                 }
                 dkCheckInRecord.setDescription(appDTO.getDescription());
+                dkCheckInRecord.setAttendanceGroupId(appDTO.getAttendanceGroupId());
+                dkCheckInRecord.setAttendanceGroupName(appDTO.getAttendanceGroupName());
                 dkRecordMapper.insertOrUpdate(dkCheckInRecord);
                 return "更新打卡成功";
             }else{
@@ -248,6 +259,8 @@ public class DkAppServiceImpl implements DkAppService {
                             dkCheckInRecord.setMonth(appDTO.getMonth());
                             dkCheckInRecord.setWeek(appDTO.getWeek());
                             dkCheckInRecord.setDay(appDTO.getDay());
+                            dkCheckInRecord.setAttendanceGroupId(appDTO.getAttendanceGroupId());
+                            dkCheckInRecord.setAttendanceGroupName(appDTO.getAttendanceGroupName());
                             dkRecordMapper.insertOrUpdate(dkCheckInRecord);
                             dkCheckInRecord.setDescription(appDTO.getDescription());
                             return "提前打卡";
@@ -267,6 +280,8 @@ public class DkAppServiceImpl implements DkAppService {
                         dkCheckInRecord.setWeek(appDTO.getWeek());
                         dkCheckInRecord.setDay(appDTO.getDay());
                         dkCheckInRecord.setDescription(appDTO.getDescription());
+                        dkCheckInRecord.setAttendanceGroupId(appDTO.getAttendanceGroupId());
+                        dkCheckInRecord.setAttendanceGroupName(appDTO.getAttendanceGroupName());
                         dkRecordMapper.insertOrUpdate(dkCheckInRecord);
                         return "打卡成功";
                     }
@@ -285,6 +300,8 @@ public class DkAppServiceImpl implements DkAppService {
                     dkCheckInRecord.setWeek(appDTO.getWeek());
                     dkCheckInRecord.setDay(appDTO.getDay());
                     dkCheckInRecord.setDescription(appDTO.getDescription());
+                    dkCheckInRecord.setAttendanceGroupId(appDTO.getAttendanceGroupId());
+                    dkCheckInRecord.setAttendanceGroupName(appDTO.getAttendanceGroupName());
                     dkRecordMapper.insertOrUpdate(dkCheckInRecord);
                     return "提前打卡";
                 }
@@ -302,6 +319,8 @@ public class DkAppServiceImpl implements DkAppService {
                 dkCheckInRecord.setWeek(appDTO.getWeek());
                 dkCheckInRecord.setDay(appDTO.getDay());
                 dkCheckInRecord.setDescription(appDTO.getDescription());
+                dkCheckInRecord.setAttendanceGroupId(appDTO.getAttendanceGroupId());
+                dkCheckInRecord.setAttendanceGroupName(appDTO.getAttendanceGroupName());
                 dkRecordMapper.insertOrUpdate(dkCheckInRecord);
                 return "打卡成功";
             }
@@ -324,7 +343,8 @@ public class DkAppServiceImpl implements DkAppService {
             dkCheckInRecord.setClockOut(TimeUtils.parseStr2LocalDateTime(appDTO.getClockOut()));
             dkCheckInRecord.setCheckInType(appDTO.getCheckInType());
             dkCheckInRecord.setDescription(appDTO.getDescription());
-
+            dkCheckInRecord.setAttendanceGroupId(appDTO.getAttendanceGroupId());
+            dkCheckInRecord.setAttendanceGroupName(appDTO.getAttendanceGroupName());
             dkRecordMapper.insertOrUpdate(dkCheckInRecord);
             return "打卡成功";
         }

zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkAttendanceGroupServiceImpl.java

@@ -74,6 +74,8 @@ public class DkAttendanceGroupServiceImpl implements DkAttendanceGroupService {
                 dkAttendanceGroupAndUser.setUserId(e.getUserId());
                 dkAttendanceGroupAndUser.setUserName(e.getUserName());
                 dkAttendanceGroupAndUser.setDeptName(e.getDeptName());
+                dkAttendanceGroupAndUser.setAttendanceGroupName(dkAttendanceGroup.getName());
+                dkAttendanceGroupAndUser.setNickName(e.getNickName());
                 dkAttendanceGroupAndUserMapper.insertOrUpdate(dkAttendanceGroupAndUser);
             });
         }

zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkRecordServiceImpl.java

@@ -27,9 +27,11 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
+import java.time.format.TextStyle;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 @Service
 public class DkRecordServiceImpl implements DkRecordService {
@@ -272,7 +274,9 @@ public class DkRecordServiceImpl implements DkRecordService {
             // 获取星期几（返回 DayOfWeek 枚举）
             DayOfWeek dayOfWeek = localDate.getDayOfWeek();
             int week = dayOfWeek.getValue();
-            dayRecord.setWeekday(String.valueOf(week));
+            String chineseWeek = dayOfWeek.getDisplayName(TextStyle.FULL, Locale.CHINESE);
+//            System.out.println("中文星期：" + chineseWeek); // 输出：星期三
+            dayRecord.setWeekday(chineseWeek);
             dayRecord.setStartTime(null != dk.getClockIn() ? dk.getClockIn().format(DateTimeFormatter.ofPattern("HH:mm")) : "");
             dayRecord.setEndTime(null != dk.getClockOut() ? dk.getClockOut().format(DateTimeFormatter.ofPattern("HH:mm")) : "");
             // 打卡异常判断