人员修改

src/main/java/com/ydtech/modules/admin/model/SysUserTrack.java

@@ -1,47 +1,80 @@
 package com.ydtech.modules.admin.model;
 
-import cn.dev33.satoken.stp.StpUtil;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.ydtech.modules.base.controller.BaseController;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
-
-@Data
+/**
+ * 系统用户审核轨迹表
+ * @TableName sys_user_track
+ */
 @AllArgsConstructor
 @NoArgsConstructor
-public class SysUserTrack {
+@TableName(value ="sys_user_track")
+@Data
+public class SysUserTrack implements Serializable {
     /**
-     * id
+     * 主键id
      */
-    private Integer id;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
     /**
      * 用户id
      */
+    @TableField(value = "user_id")
     private String userId;
+
     /**
-     * 用户状态 0,"离司",1,"正常",2,"入司待审核",3,"入司审核驳回",4,"离司待审核",5,"离司审核驳回"
+     * 状态  1：正常   0：删除 2：审批中  3：审批不通过
      */
+    @TableField(value = "status")
     private Integer status;
+
     /**
      * 审核人
      */
+    @TableField(value = "approve_by")
     private String approveBy;
+
+    /**
+     * 审核人id
+     */
+    @TableField(value = "approve_by_id")
+    private String approveById;
+
     /**
      * 审核时间
      */
+    @TableField(value = "approve_time")
     private Date approveTime;
+
     /**
      * 审核信息
      */
+    @TableField(value = "approve_mess")
     private String approveMess;
 
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
 
     public SysUserTrack(SysUser sysUser) {
         this.userId = sysUser.getId();
         this.status = sysUser.getStatus();
-        this.approveBy = StpUtil.getLoginId().toString();
+        SysUser user = BaseController.getUser();
+        this.approveBy = user.getId();
+        this.approveById = user.getName();
         this.approveTime = new Date();
     }
 
+
 }