用户管理新建添加入职时间字段

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -1,6 +1,7 @@
 package com.ruoyi.common.core.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.annotation.Sensitive;
@@ -165,4 +166,8 @@ public class SysUser extends BaseEntity {
         return UserConstants.ADMIN_ID.equals(this.userId);
     }
 
+    // 入职时间
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date joinedDate;
+
 }

zs-manager/src/main/java/com/ruoyi/zhushi/job/DkJob.java

@@ -43,6 +43,9 @@ public class DkJob {
                 // 获取员工姓名
                 String userName = jsonObject.getString("userName");
 
+                // 获取员工昵称
+                String nickName = jsonObject.getString("nickName");
+
                 // 根据userId 查询考勤组信息
                 DkAttendanceGroup appDTO = dkRecordMapper.queryConfigByUserId(userId);
                 // 如果没有考勤组信息，则跳过
@@ -55,6 +58,7 @@ public class DkJob {
                 DkCheckInRecord dkCheckInRecord = new DkCheckInRecord();
                 dkCheckInRecord.setSysUserId(userId);
                 dkCheckInRecord.setSysUserName(userName);
+                dkCheckInRecord.setNickName(nickName);
                 dkCheckInRecord.setCheckInTime(LocalDateTime.now());
                 dkCheckInRecord.setCheckInStatus(Constans.CHECK_IN_STATUS_0);
                 dkCheckInRecord.setClockInStatus(Constans.CHECK_IN_STATUS_0);

zs-manager/src/main/resources/mapper/DkRecordMapper.xml

@@ -40,7 +40,7 @@
     </select>
 
     <select id="queryAllUsers" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT user_id userId, user_name userName FROM `sys_user`
+        SELECT user_id userId, user_name userName, , nick_name nickName FROM `sys_user`
     </select>
 
     <select id="getRecordHistory" resultType="com.ruoyi.zhushi.entity.DkCheckInRecord">