From b7e12f6bfcf7d42169dffa5f169843e714833b6a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 23 四月 2021 12:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java | 258 ++++++++++++++++++++++++++++++---------------------
1 files changed, 151 insertions(+), 107 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java
index 0bdb925..3401d6a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java
@@ -2,13 +2,17 @@
import java.io.Serializable;
import java.util.Date;
+
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
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 com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -17,134 +21,174 @@
import org.springframework.format.annotation.DateTimeFormat;
/**
-*
-* name:EmpPhysicalExam
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工体检信息数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-31 09:11:00
-* @since JDK1.8
-*/
+ * name:EmpPhysicalExam
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工体检信息数据表映射实体
+ *
+ * @author luoyibo
+ * @date 2021-01-31 09:11:00
+ * @since JDK1.8
+ */
@Data
@TableName("t_emp_physicalexam")
-public class EmpPhysicalExam implements Serializable{
+@Excel("员工体检信息")
+public class EmpPhysicalExam implements Serializable {
- @FieldInfo(name = "physicalExamId",type = "bigint",explain = "体检Id")
- @TableId(value = "physicalExamId")
- private Long physicalExamId=0L;
+ //@FieldInfo(name = "physicalExamId", type = "bigint", explain = "体检Id")
+ @TableId(value = "physicalExamId")
+ private Long physicalExamId = 0L;
- @FieldInfo(name = "empId",type = "bigint",explain = "员工Id")
- @TableField("empId")
- private Long empId=0L;
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- @FieldInfo(name = "empNumb",type = "varchar",explain = "员工编号")
- @TableField("empNumb")
- private String empNumb="";
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
+ @TableField("empNumb")
+ @ExcelField(value = "编号")
+ private String empNumb = "";
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ @ExcelField(value = "岗位")
+ private String jobName = "";
+
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
+ @TableField("empName")
+ @ExcelField(value = "姓名")
+ private String empName = "";
+
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
+ @TableField("certificateNumb")
+ @ExcelField(value = "身份证号码")
+ private String certificateNumb = "";
+
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ private String sex = "";
+
+ @FieldInfo(name = "hospital", type = "varchar", explain = "体检医院")
+ @TableField("hospital")
+ @ExcelField(value = "体检医院")
+ private String hospital = "";
+
+ @FieldInfo(name = "physicalExamDate", type = "date", explain = "体检日期")
+ @TableField("physicalExamDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "体检日期", writeConverter = TimeConverter.class)
+ private Date physicalExamDate;
+
+ @FieldInfo(name = "physicalExamTypeName", type = "varchar", explain = "体检类型")
+ @TableField(exist = false)
+ @ExcelField(value = "体检类型")
+ private String physicalExamTypeName = "";
+
+ @FieldInfo(name = "bloodPressure", type = "varchar", explain = "血压")
+ @TableField("bloodPressure")
+ @ExcelField(value = "血压")
+ private String bloodPressure = "";
+
+ @FieldInfo(name = "transaminase", type = "varchar", explain = "转氨酶")
+ @TableField("transaminase")
+ @ExcelField(value = "转氨酶")
+ private String transaminase = "";
+
+ @FieldInfo(name = "ecgName", type = "varchar", explain = "心电图")
+ @TableField(exist = false)
+ @ExcelField(value = "心电图")
+ private String ecgName = "";
+
+ @FieldInfo(name = "conclusion", type = "varchar", explain = "体检结论")
+ @TableField("conclusion")
+ @ExcelField(value = "体检结论")
+ private String conclusion = "";
- @FieldInfo(name = "empName",type = "varchar",explain = "员工姓名")
- @TableField("empName")
- private String empName="";
-
- @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
- @TableField("empStatus")
- private String empStatus = "";
+ @FieldInfo(name = "reviewRecord", type = "varchar", explain = "复查记录")
+ @TableField("reviewRecord")
+ @ExcelField(value = "复查记录")
+ private String reviewRecord = "";
- @FieldInfo(name = "certificateNumb",type = "varchar",explain = "证件号码")
- @TableField("certificateNumb")
- private String certificateNumb="";
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ @ExcelField(value = "备注")
+ private String remark = "";
+
+ @FieldInfo(name = "physicalExamType", type = "varchar", explain = "体检类型")
+ @TableField("physicalExamType")
+ private String physicalExamType = "";
+
+ @FieldInfo(name = "ecg", type = "varchar", explain = "心电图")
+ @TableField("ecg")
+ private String ecg = "";
- @FieldInfo(name = "sex",type = "varchar",explain = "性别码")
- @TableField("sex")
- private String sex="";
+ @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
+ @TableField("empStatus")
+// @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
+ private String empStatus = "";
- @FieldInfo(name = "deptId",type = "bigint",explain = "部门Id")
- @TableField("deptId")
- private Long deptId=0L;
+
- @FieldInfo(name = "deptName",type = "varchar",explain = "部门名称")
- @TableField("deptName")
- private String deptName="";
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- @FieldInfo(name = "JobId",type = "bigint",explain = "岗位Id")
- @TableField("JobId")
- private Long jobId=0L;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
+ @TableField("deptName")
+ private String deptName = "";
- @FieldInfo(name = "jobName",type = "varchar",explain = "岗位名称")
- @TableField("jobName")
- private String jobName="";
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
- @FieldInfo(name = "hospital",type = "varchar",explain = "体检医院")
- @TableField("hospital")
- private String hospital="";
+
+
- @FieldInfo(name = "physicalExamDate",type = "date",explain = "体检日期")
- @TableField("physicalExamDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern="yyyy-MM-dd")
- private Date physicalExamDate;
+
- @FieldInfo(name = "physicalExamType",type = "varchar",explain = "体检类型")
- @TableField("physicalExamType")
- private String physicalExamType="";
+ //@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 = "bloodPressure",type = "varchar",explain = "血压")
- @TableField("bloodPressure")
- private String bloodPressure="";
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
- @FieldInfo(name = "transaminase",type = "varchar",explain = "转氨酶")
- @TableField("transaminase")
- private String transaminase="";
+ //@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 = "ecg",type = "varchar",explain = "心电图")
- @TableField("ecg")
- private String ecg="";
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
- @FieldInfo(name = "conclusion",type = "varchar",explain = "体检结论")
- @TableField("conclusion")
- private String conclusion="";
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
- @FieldInfo(name = "reviewRecord",type = "varchar",explain = "复查记录")
- @TableField("reviewRecord")
- private String reviewRecord="";
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version = 0;
- @FieldInfo(name = "remark",type = "varchar",explain = "备注")
- @TableField("remark")
- private String remark="";
+ @TableField(exist = false)
+ private String physicalExamDateStr = "";
- @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 = "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 = "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 = "version",type = "int",explain = "记录版本号，用来进行乐观锁控制")
- @TableField("version")
- @Version
- private Integer version=0;
-
- @TableField(exist = false)
- private String physicalExamDateStr= "";
-
-}
\ No newline at end of file
+
+}
--
Gitblit v1.8.0