From a491941cece9a90d72c9c6b0aab0e718e39dbd3c Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Mon, 22 Aug 2022 15:54:22 +0800
Subject: [PATCH] 从业记录新增同步sql 修改，用户新增审查逻辑修改，外网部门只更新状态，不更新审查明细，内网状态和明细都更新
---
src/main/java/org/springblade/modules/experience/entity/Experience.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/experience/entity/Experience.java b/src/main/java/org/springblade/modules/experience/entity/Experience.java
index afccb07..62ffca8 100644
--- a/src/main/java/org/springblade/modules/experience/entity/Experience.java
+++ b/src/main/java/org/springblade/modules/experience/entity/Experience.java
@@ -47,48 +47,56 @@
*/
@ApiModelProperty(value = "姓名")
private String name;
+
/**
* 岗位
*/
@ApiModelProperty(value = "岗位")
private String post;
+
/**
* 部门
*/
@ApiModelProperty(value = "部门")
private String department;
+
/**
* 岗位职责
*/
@ApiModelProperty(value = "岗位职责")
private String responsibilities;
+
/**
* 入职时间
*/
@ApiModelProperty(value = "入职时间")
@TableField("entryTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entrytime;
+
/**
* 离职时间
*/
@ApiModelProperty(value = "离职时间")
@TableField("departureTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date departuretime;
+
/**
* 离职原因
*/
@ApiModelProperty(value = "离职原因")
private String leaving;
+
/**
* 身份证号
*/
@ApiModelProperty(value = "身份证号")
@TableField("cardId")
private String cardid;
+
/**
* 公司名称
*/
@@ -98,5 +106,11 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ /**
+ * 保安员id
+ */
+ @TableField("securityId")
+ private String securityid;
+
}
--
Gitblit v1.9.3