From d65293482a2f06c23b8d1d5cd1d440d1302d915d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 16 Mar 2024 18:03:20 +0800
Subject: [PATCH] 从业人员查询统计修改，去除多余字段
---
src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 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 8384c31..4bd0493 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
@@ -40,12 +40,9 @@
@ApiModel(value = "PlacePractitioner对象", description = "场所从业人员")
public class PlacePractitionerEntity implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 主键
- */
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("主键id")
- @TableId(value = "id", type = IdType.ASSIGN_ID)
+ /** 主键 */
+ @ApiModelProperty(value = "主键ID", example = "")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 场所ID */
@@ -63,8 +60,8 @@
@TableField("telephone")
private String telephone;
- /** 现住地址 */
- @ApiModelProperty(value = "现住地址", example = "")
+ /** 暂住地 */
+ @ApiModelProperty(value = "暂住地", example = "")
@TableField("temp_address")
private String tempAddress;
@@ -83,23 +80,8 @@
@TableField("id_card")
private String idCard;
- /** 证件类型，业务字典 cardType */
- @ApiModelProperty(value = "证件类型，业务字典 cardType", example = "")
- @TableField("card_type")
- private String cardType;
-
- /** 工作单位(就职单位) */
- @ApiModelProperty(value = "工作单位(就职单位)", example = "")
- @TableField("employer")
- private String employer;
-
- /** 户籍地址 */
- @ApiModelProperty(value = "户籍地址", example = "")
- @TableField("registered_address")
- private String registeredAddress;
-
- /** 岗位性质 */
- @ApiModelProperty(value = "岗位性质", example = "")
+ /** 岗位 */
+ @ApiModelProperty(value = "岗位", example = "")
@TableField("job_nature")
private String jobNature;
@@ -108,31 +90,53 @@
@TableField("employer_img")
private String employerImg;
- /** 微信号 */
- @ApiModelProperty(value = "微信号", example = "")
- @TableField("wx_account")
- private String wxAccount;
-
/** 创建时间 */
@ApiModelProperty(value = "创建时间", example = "")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField(value = "create_time",fill = FieldFill.INSERT)
private Date createTime;
- /** 生日 */
- @ApiModelProperty(value = "生日", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @TableField("birthday")
- private Date birthday;
/** 民族 */
@ApiModelProperty(value = "民族", example = "")
@TableField("ethnicity")
private Integer ethnicity;
- /** 民族 */
+ /** 0：否1：是 */
@ApiModelProperty(value = "0：否1：是", example = "")
@TableField("is_deleted")
+ @TableLogic
private Integer isDeleted;
+ /** 0:否 1：是 前科 */
+ @ApiModelProperty(value = "0:否 1：是 前科", example = "")
+ @TableField("criminal_record_flag")
+ private Integer criminalRecordFlag;
+
+ /** 0:否 1：是 假身份证 */
+ @ApiModelProperty(value = "0:否 1：是 假身份证", example = "")
+ @TableField("fake_id_card")
+ private Integer fakeIdCard;
+
+ /** 审查异常分类 */
+ @ApiModelProperty(value = "审查异常分类", example = "")
+ @TableField("ano_type_name")
+ private String anoTypeName;
+
+ /** 入职时间 */
+ @ApiModelProperty(value = "入职时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(value = "employment_time")
+ private Date employmentTime;
+
+ /** 离职时间 */
+ @ApiModelProperty(value = "离职时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("resignation_time")
+ private Date resignationTime;
+
+ /** 是离职 1：否 2：是 */
+ @ApiModelProperty(value = "是离职 1：否 2：是", example = "")
+ @TableField("resignation_flag")
+ private Integer resignationFlag;
}
--
Gitblit v1.9.3