From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/attendance/entity/Attendance.java | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/attendance/entity/Attendance.java b/src/main/java/org/springblade/modules/attendance/entity/Attendance.java
index 8217c71..dd97ca9 100644
--- a/src/main/java/org/springblade/modules/attendance/entity/Attendance.java
+++ b/src/main/java/org/springblade/modules/attendance/entity/Attendance.java
@@ -2,11 +2,14 @@
package org.springblade.modules.attendance.entity;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
/**
* 考勤打卡实体类
@@ -16,27 +19,25 @@
*/
@Data
@TableName("sys_attendance")
-@ApiModel(value = "Attendance对象", description = "Attendance对象")
public class Attendance implements Serializable {
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ /**
+ * 雪花算法，非自增
+ */
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
/**
- * 姓名
+ * 用户id
*/
- private String name;
- /**
- * 编号
- */
- private String number;
+ private Long userId;
/**
- * 部门
+ * 部门id
*/
- private String department;
+ private Long deptId;
/**
* 天气
@@ -47,7 +48,10 @@
/**
* 打卡时间
*/
- private String clockTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date clockTime;
+
/**
* 经度
*/
@@ -59,21 +63,29 @@
private String wd;
/**
- * 打卡类型 0：上班 1：下班
+ * 打卡类型 1：上班 2：下班
*/
- private String clocktype;
+ private Integer clockType;
/**
- * 考勤类型 0：正常 1：迟到 2：早退 3：外勤
+ * 考勤类型 1：正常 2：迟到 3：早退
*/
- private String attendancetype;
+ private Integer attendanceType;
+ /**
+ * 星期
+ */
private String week;
+ /**
+ * 地址
+ */
private String address;
- @TableLogic
- private Integer isDeleted;
+ /**
+ * 是否为外勤打卡
+ */
+ private Integer legwork;
}
--
Gitblit v1.9.3