From 759c5b1cad51c74c590135ebadbfb410731dcd10 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 14 二月 2026 16:55:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpClockIn.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpClockIn.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpClockIn.java
index b67313b..eff4f71 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpClockIn.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpClockIn.java
@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -36,19 +39,33 @@
@ApiModelProperty(value = "用户id")
private Long appUserId;
- @ApiModelProperty(value = "打卡日期")
- private LocalDateTime clockTime;
+ @ApiModelProperty(value = "上班打卡日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ private LocalDateTime clockInTime;
+
+ @ApiModelProperty(value = "上班打卡日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ private LocalDateTime clockOutTime;
@ApiModelProperty(value = "班次id")
private Long shiftId;
- @ApiModelProperty(value = "打卡结果 1=正常 2=迟到 3=缺卡")
- private Integer clockResult;
+ @ApiModelProperty(value = "上班打卡结果 1=正常 2=迟到 3=缺卡")
+ private Integer clockInResult;
- @ApiModelProperty(value = "打卡经度")
- private Double clockLon;
+ @ApiModelProperty(value = "下班打卡结果 1=正常 2=早退 3=缺卡")
+ private Integer clockOutResult;
- @ApiModelProperty(value = "打卡纬度")
- private Double clockLat;
+ @ApiModelProperty(value = "上班打卡经度")
+ private Double clockInLon;
+
+ @ApiModelProperty(value = "上班打卡纬度")
+ private Double clockInLat;
+
+ @ApiModelProperty(value = "下班打卡经度")
+ private Double clockOutLon;
+
+ @ApiModelProperty(value = "下班打卡纬度")
+ private Double clockOutLat;
}
--
Gitblit v1.7.1