From 44e0f0472d8efa0646b20db8a40c16beab0b752e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 06 四月 2024 12:22:12 +0800
Subject: [PATCH] feat: 一些需求改进 打开档案时增加了部门选择项 处理了合同信息录入时的性别不自动填入问题 合同到期提醒模块发布
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java | 102 ++++++++++++++++++++++-----------------------------
1 files changed, 44 insertions(+), 58 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
index f436bf6..81cae34 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
@@ -1,80 +1,66 @@
package cc.mrbird.febs.common.core.entity.system;
-import java.io.Serializable;
-import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
-import cc.mrbird.febs.common.core.utils.DateDeSerializer;
-import cc.mrbird.febs.common.core.utils.DateSerializer;
-import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
-import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
/**
-*
-* name:Position
-* package:cc.mrbird.febs.server.system.controller
-* description:岗位信息数据表映射实体
-*
-* @author Alan
-* @date 2021-02-16 11:52:53
-* @since JDK1.8
-*/
+ * name:Position
+ * package:cc.mrbird.febs.server.system.controller
+ * description:岗位信息数据表映射实体
+ *
+ * @author Alan
+ * @date 2021-02-16 11:52:53
+ * @since JDK1.8
+ */
@Data
@TableName("t_position")
-public class Position implements Serializable{
+public class Position implements Serializable {
- @FieldInfo(name = "positionId",type = "bigint",explain = "岗位Id")
- @TableId(value = "positionId")
- private Long positionId=0L;
+ @FieldInfo(name = "positionId", type = "varchar", explain = "岗位Id")
+ @TableId(value = "positionId")
+ private Long positionId = 0L;
- @FieldInfo(name = "positionName",type = "varchar",explain = "岗位名称")
- @TableField("positionName")
- private String positionName="";
+ @FieldInfo(name = "positionName", type = "varchar", explain = "岗位名称")
+ @TableField("positionName")
+ private String positionName = "";
- @FieldInfo(name = "positionCode",type = "varchar",explain = "岗位编码")
- @TableField("positionCode")
- private String positionCode="";
+ @FieldInfo(name = "positionCode", type = "varchar", explain = "岗位编码")
+ @TableField("positionCode")
+ private String positionCode = "";
- @FieldInfo(name = "customerId",type = "bigint",explain = "租户Id")
- @TableField("customerId")
- private Long customerId=0L;
+ @FieldInfo(name = "customerId", type = "bigint", explain = "租户Id")
+ @TableField("customerId")
+ private Long customerId = 0L;
- @FieldInfo(name = "createTime",type = "datetime",explain = "记录创建时间")
- @TableField("createTime")
- @JsonSerialize(using = DateTimeSerializer.class)
- @JsonDeserialize(using = DateTimeDeserializer.class)
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @TableField("createTime")
+ private Date createTime;
- @FieldInfo(name = "creator",type = "varchar",explain = "记录创建人")
- @TableField("creator")
- private String creator="";
+ @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
- @FieldInfo(name = "modifyTime",type = "datetime",explain = "记录最后更新时间")
- @TableField("modifyTime")
- @JsonSerialize(using = DateTimeSerializer.class)
- @JsonDeserialize(using = DateTimeDeserializer.class)
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modifyTime;
+ @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ @TableField("modifyTime")
+ private Date modifyTime;
- @FieldInfo(name = "modifier",type = "varchar",explain = "记录最后更新人")
- @TableField("modifier")
- private String modifier="";
+ @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
- @FieldInfo(name = "delFlag",type = "bit",explain = "记录删除标志。0-未删除 1-已删除，默认0")
- @TableField("delFlag")
- private Integer delFlag=0;
+ @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
- @FieldInfo(name = "version",type = "int",explain = "记录版本号，用来进行乐观锁控制")
- @TableField("version")
- @Version
- private Integer version=0;
+ @TableField("version")
+ @Version
+ private Integer version = 0;
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0