From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计

---
 src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java |   63 +++++++++++++------------------
 1 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
index 09d067e..93f4aa6 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
@@ -1,31 +1,10 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.modules.place.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -80,13 +59,8 @@
 	@TableField("id_card")
 	private String idCard;
 
-	/** 证件类型,业务字典  cardType */
-	@ApiModelProperty(value = "证件类型,业务字典  cardType", example = "")
-	@TableField("card_type")
-	private String cardType;
-
-	/** 岗位性质 */
-	@ApiModelProperty(value = "岗位性质", example = "")
+	/** 岗位 */
+	@ApiModelProperty(value = "岗位", example = "")
 	@TableField("job_nature")
 	private String jobNature;
 
@@ -101,12 +75,6 @@
 	@TableField(value = "create_time",fill = FieldFill.INSERT)
 	private Date createTime;
 
-	/** 生日 */
-	@ApiModelProperty(value = "生日", example = "")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@TableField("birthday")
-	private Date birthday;
-
 	/** 民族 */
 	@ApiModelProperty(value = "民族", example = "")
 	@TableField("ethnicity")
@@ -115,7 +83,7 @@
 	/** 0:否1:是 */
 	@ApiModelProperty(value = "0:否1:是", example = "")
 	@TableField("is_deleted")
-	@TableLogic
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 
 	/** 0:否 1:是 前科 */
@@ -135,13 +103,13 @@
 
 	/** 入职时间 */
 	@ApiModelProperty(value = "入职时间", example = "")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	@TableField(value = "employment_time")
 	private Date employmentTime;
 
 	/** 离职时间 */
 	@ApiModelProperty(value = "离职时间", example = "")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	@TableField("resignation_time")
 	private Date resignationTime;
 
@@ -150,4 +118,25 @@
 	@TableField("resignation_flag")
 	private Integer resignationFlag;
 
+	/** 审核确认人用户id */
+	@ApiModelProperty(value = "审核确认人用户id", example = "")
+	@TableField("confirm_user_id")
+	private Long confirmUserId;
+
+	/** 确认标记 1:待审核  2:审核通过  3:审核不通过 4:待完善 */
+	@ApiModelProperty(value = "确认标记 1:待审核  2:审核通过  3:审核不通过 4:待完善", example = "")
+	@TableField("confirm_flag")
+	private Integer confirmFlag;
+
+	/** 审核确认时间 */
+	@ApiModelProperty(value = "审核确认时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("confirm_time")
+	private Date confirmTime;
+
+	/** 审核意见 */
+	@ApiModelProperty(value = "审核意见", example = "")
+	@TableField("confirm_notion")
+	private String confirmNotion;
+
 }

--
Gitblit v1.9.3