From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/system/entity/User.java | 144 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 128 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 23c7f38..7bc042b 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -18,10 +18,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -76,6 +78,8 @@
/**
* 生日
*/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date birthday;
/**
* 性别
@@ -124,7 +128,7 @@
* 身高
*/
@ApiModelProperty(value = "身高")
- private Float height;
+ private String height;
/**
* 联系电话
*/
@@ -135,22 +139,130 @@
*/
@ApiModelProperty(value = "邮箱")
private String emails;
- /**
- * 联系地址
- */
- @ApiModelProperty(value = "联系地址")
- private String address;
- /**
- * 户口所在地
- */
- @ApiModelProperty(value = "户口所在地")
- private String registered ;
- /**
- * 入职时间
- */
- @ApiModelProperty(value = "入职时间")
- private String rtime;
+ private String hold;
+ private Integer status;
+ /**
+ * 行政区域id
+ */
+ private String jurisdiction;
+ /**
+ * 保安员证编码
+ */
+ private String securitynumber;
+ /**
+ * 审查状态
+ */
+ @TableField("examination_type")
+ private String examinationType;
+
+
+ /**
+ * 审查明细
+ */
+ @TableField("examination_mx")
+ private String examinationMx;
+
+ /**
+ * 指纹url
+ */
+ private String fingerprint;
+
+ /**
+ * 是否采集照片
+ */
+ private String photo;
+
+ /**
+ * 是否派遣
+ */
+ private String dispatch;
+
+ /**
+ * 指纹特征
+ */
+ @TableField("my_picture")
+ private String myPicture;
+
+ /**
+ * 是否报名考试 1：是 2：否
+ */
+ @TableField("is_apply")
+ private Integer isApply;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date birthtime;
+
+ /**
+ * 是否报名培训 1：是 2：否
+ */
+ @TableField("is_train")
+ private Integer isTrain;
+ /**
+ * 健康状态 0：健康 1：良好 2：一般 3：较差
+ */
+ private String healstats;
+ private String soil;
+
+ /**
+ * 发证日期（保安证）
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @TableField("paper_time")
+ private Date paperTime;
+ /**
+ * 离职原因
+ */
+ @TableField("reason_for_leav")
+ private String reasonForLeav;
+
+ /**
+ * 离职图片
+ */
+ @TableField("img_for_leav")
+ private String imgForLeav;
+
+ private String holdv;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date holdvtime;
+
+ /**
+ * 是否缴纳保险 0：是 1：否
+ */
+ private Integer insurance;
+
+ /**
+ * 审查时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("audit_time")
+ private Date auditTime;
+
+ /**
+ * 持枪编码
+ */
+ private String guncode;
+
+ /**
+ * 押运人员设备编号
+ */
+ @TableField("equipment_code")
+ private String equipmentCode;
+
+ /**
+ * 是否冻结 0：否 1：是
+ */
+ private Integer isFreeze;
+
+ /**
+ * 审核状态：1、审核通过；2、审核不通过 10、待审核
+ */
+ private Integer auditStatus;
}
--
Gitblit v1.9.3