From 3ae6bd194fe1f17b4f5d96cb78b057705e5d0d78 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 31 五月 2021 14:11:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 334 +++++++++++++++++++++++++++++--------------------------
1 files changed, 177 insertions(+), 157 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
index b6b0d93..598466d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
@@ -38,57 +38,39 @@
public class EmpOccupational implements Serializable {
private static final long serialVersionUID = 5704201515491620531L;
- @FieldInfo(name = "occupationalId", type = "bigint", explain = "案件Id")
+ //@FieldInfo(name = "occupationalId", type = "bigint", explain = "案件Id")
@TableId("occupationalId")
private Long occupationalId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
- @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
-
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
- @TableField("empName")
- @ExcelField(value = "员工姓名")
- private String empName = "";
- @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
- @TableField("empStatus")
- @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
- private String empStatus = "";
-
- @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
- @TableField("sex")
- @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
- private String sex = "";
-
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
- @TableField("certificateNumb")
- @ExcelField(value = "证件号码")
- private String certificateNumb = "";
-
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
- @TableField("deptId")
- private Long deptId = 0L;
-
- @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
- @TableField("deptName")
- @ExcelField(value = "部门名称")
- private String deptName = "";
-
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
- @TableField("JobId")
- private Long jobId = 0L;
-
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
- @ExcelField(value = "岗位名称")
+ @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 = "injuredTime", type = "datetime", explain = "受伤时间")
@TableField("injuredTime")
@JsonSerialize(using = DateTimeSerializer.class)
@@ -106,17 +88,17 @@
@TableField("injuredPart")
@ExcelField(value = "受伤部位")
private String injuredPart = "";
-
- @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "受伤诊断")
- @TableField("injuredDiacrisis")
- @ExcelField(value = "受伤诊断")
- private String injuredDiacrisis = "";
-
+
@FieldInfo(name = "injuredDescribe", type = "varchar", explain = "受伤经过描述")
@TableField("injuredDescribe")
@ExcelField(value = "受伤经过描述")
private String injuredDescribe = "";
-
+
+ @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "受伤诊断")
+ @TableField("injuredDiacrisis")
+ @ExcelField(value = "工伤诊断")
+ private String injuredDiacrisis = "";
+
@FieldInfo(name = "hospitalName", type = "varchar", explain = "就诊医院")
@TableField("hospitalName")
@ExcelField(value = "就诊医院")
@@ -131,8 +113,7 @@
@TableField("hospitalizatioFlag")
@ExcelField(value = "是否住院", writeConverterExp = "0=未住院,1=已住院")
private Integer hospitalizatioFlag = 0;
- @TableField(exist = false)
- private String hospitalizatioFlagName ;
+
@FieldInfo(name = "bedNumb", type = "varchar", explain = "床号")
@TableField("bedNumb")
@ExcelField(value = "床号")
@@ -158,7 +139,12 @@
@TableField("sbumitBy")
@ExcelField(value = "递交人")
private String sbumitBy = "";
-
+
+ @FieldInfo(name = "expensesFee", type = "decimal", explain = "医疗总费用")
+ @TableField("expensesFee")
+ @ExcelField(value = "医疗总费用")
+ private BigDecimal expensesFee = BigDecimal.ZERO;
+
@FieldInfo(name = "hrDoDate", type = "date", explain = "人事处理时间")
@TableField("hrDoDate")
@JsonSerialize(using = DateSerializer.class)
@@ -166,116 +152,11 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelField(value = "人事处理时间", writeConverter = TimeConverter.class)
private Date hrDoDate;
-
- @FieldInfo(name = "expensesFee", type = "decimal", explain = "医疗总费用")
- @TableField("expensesFee")
- @ExcelField(value = "医疗总费用")
- private BigDecimal expensesFee = BigDecimal.ZERO;
-
- @FieldInfo(name = "eliminate", type = "decimal", explain = "剔除总额")
- @TableField("eliminate")
- @ExcelField(value = "剔除总额")
- private BigDecimal eliminate = BigDecimal.ZERO;
-
- @FieldInfo(name = "socialDisability", type = "decimal", explain = "一次性伤残补助金")
- @TableField("socialDisability")
- @ExcelField(value = "一次性伤残补助金")
- private BigDecimal socialDisability = BigDecimal.ZERO;
-
- @FieldInfo(name = "socialAllowance", type = "decimal", explain = "住院伙食补贴")
- @TableField("socialAllowance")
- @ExcelField(value = "住院伙食补贴")
- private BigDecimal socialAllowance = BigDecimal.ZERO;
-
- @FieldInfo(name = "socialSubsidy", type = "decimal", explain = "一次性医疗补助金")
- @TableField("socialSubsidy")
- @ExcelField(value = "一次性医疗补助金")
- private BigDecimal socialSubsidy = BigDecimal.ZERO;
-
- @FieldInfo(name = "socialCompensation", type = "decimal", explain = "社保赔偿总费用")
- @TableField("socialCompensation")
- @ExcelField(value = "社保赔偿总费用")
- private BigDecimal socialCompensation = BigDecimal.ZERO;
-
- @FieldInfo(name = "compensated", type = "decimal", explain = "已赔付医药费用")
- @TableField("compensated")
- @ExcelField(value = "已赔付医药费用")
- private BigDecimal compensated = BigDecimal.ZERO;
-
- @FieldInfo(name = "otherCompensated", type = "decimal", explain = "其他赔偿报销")
- @TableField("otherCompensated")
- @ExcelField(value = "其他赔偿报销")
- private BigDecimal otherCompensated = BigDecimal.ZERO;
-
- @FieldInfo(name = "companylDisability", type = "decimal", explain = "公司一次性伤残补助金")
- @TableField("companylDisability")
- @ExcelField(value = "公司一次性伤残补助金")
- private BigDecimal companylDisability = BigDecimal.ZERO;
-
- @FieldInfo(name = "companyAllowance", type = "decimal", explain = "工伤生活补贴")
- @TableField("companyAllowance")
- @ExcelField(value = "工伤生活补贴")
- private BigDecimal companyAllowance = BigDecimal.ZERO;
-
- @FieldInfo(name = "companySubsidy", type = "decimal", explain = "公司一次性医疗补助金")
- @TableField("companySubsidy")
- @ExcelField(value = "公司一次性医疗补助金")
- private BigDecimal companySubsidy = BigDecimal.ZERO;
-
- @FieldInfo(name = "companyCompensation", type = "decimal", explain = "公司赔偿总费用")
- @TableField("companyCompensation")
- @ExcelField(value = "公司赔偿总费用")
- private BigDecimal companyCompensation = BigDecimal.ZERO;
-
- @FieldInfo(name = "jobSubsidy", type = "decimal", explain = "公司一次性就业补助金")
- @TableField("jobSubsidy")
- @ExcelField(value = "公司一次性就业补助金")
- private BigDecimal jobSubsidy = BigDecimal.ZERO;
-
+
@FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
@TableField("settleStatus")
- @ExcelField(value = "是否已报告", writeConverterExp = "0=未结案,1=已结案")
+ @ExcelField(value = "状态", writeConverterExp = "0=未结案,1=已结案")
private Integer settleStatus = 0;
-
- @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;
-
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- private String remark = "";
-
- @FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
- @TableField("expenseReport")
- @ExcelField(value = "报单号")
- private String expenseReport = "";
@FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
@TableField("settleDate")
@@ -285,10 +166,149 @@
@ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
private Date settleDate;
+
+
+ @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
+ @TableField("empStatus")
+// @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
+ private String empStatus = "";
+
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ private String sex = "";
+
+
+ //@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 = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
+
+
+ @TableField(exist = false)
+ private String hospitalizatioFlagName ;
+
+
+ @FieldInfo(name = "eliminate", type = "decimal", explain = "剔除总额")
+ @TableField("eliminate")
+// @ExcelField(value = "剔除总额")
+ private BigDecimal eliminate = BigDecimal.ZERO;
+
+ @FieldInfo(name = "socialDisability", type = "decimal", explain = "一次性伤残补助金")
+ @TableField("socialDisability")
+// @ExcelField(value = "一次性伤残补助金")
+ private BigDecimal socialDisability = BigDecimal.ZERO;
+
+ @FieldInfo(name = "socialAllowance", type = "decimal", explain = "住院伙食补贴")
+ @TableField("socialAllowance")
+// @ExcelField(value = "住院伙食补贴")
+ private BigDecimal socialAllowance = BigDecimal.ZERO;
+
+ @FieldInfo(name = "socialSubsidy", type = "decimal", explain = "一次性医疗补助金")
+ @TableField("socialSubsidy")
+// @ExcelField(value = "一次性医疗补助金")
+ private BigDecimal socialSubsidy = BigDecimal.ZERO;
+
+ @FieldInfo(name = "socialCompensation", type = "decimal", explain = "社保赔偿总费用")
+ @TableField("socialCompensation")
+// @ExcelField(value = "社保赔偿总费用")
+ private BigDecimal socialCompensation = BigDecimal.ZERO;
+
+ @FieldInfo(name = "compensated", type = "decimal", explain = "已赔付医药费用")
+ @TableField("compensated")
+// @ExcelField(value = "已赔付医药费用")
+ private BigDecimal compensated = BigDecimal.ZERO;
+
+ @FieldInfo(name = "otherCompensated", type = "decimal", explain = "其他赔偿报销")
+ @TableField("otherCompensated")
+// @ExcelField(value = "其他赔偿报销")
+ private BigDecimal otherCompensated = BigDecimal.ZERO;
+
+ @FieldInfo(name = "companylDisability", type = "decimal", explain = "公司一次性伤残补助金")
+ @TableField("companylDisability")
+// @ExcelField(value = "公司一次性伤残补助金")
+ private BigDecimal companylDisability = BigDecimal.ZERO;
+
+ @FieldInfo(name = "companyAllowance", type = "decimal", explain = "工伤生活补贴")
+ @TableField("companyAllowance")
+// @ExcelField(value = "工伤生活补贴")
+ private BigDecimal companyAllowance = BigDecimal.ZERO;
+
+ @FieldInfo(name = "companySubsidy", type = "decimal", explain = "公司一次性医疗补助金")
+ @TableField("companySubsidy")
+// @ExcelField(value = "公司一次性医疗补助金")
+ private BigDecimal companySubsidy = BigDecimal.ZERO;
+
+ @FieldInfo(name = "companyCompensation", type = "decimal", explain = "公司赔偿总费用")
+ @TableField("companyCompensation")
+// @ExcelField(value = "公司赔偿总费用")
+ private BigDecimal companyCompensation = BigDecimal.ZERO;
+
+ @FieldInfo(name = "jobSubsidy", type = "decimal", explain = "公司一次性就业补助金")
+ @TableField("jobSubsidy")
+// @ExcelField(value = "公司一次性就业补助金")
+ private BigDecimal jobSubsidy = BigDecimal.ZERO;
+
+
+
+ //@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;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ private String remark = "";
+
+ @FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
+ @TableField("expenseReport")
+// @ExcelField(value = "报单号")
+ private String expenseReport = "";
+
+
+
@TableField(exist = false)
private String hrDoDateStr= "";
-
+
@TableField(exist = false)
private String injuredTimeStr= "";
-}
\ No newline at end of file
+ @FieldInfo(name = "settleStatusName", type = "bit", explain = "结案状态 0-未结案 1-已结案")
+ @TableField(exist = false)
+ private String settleStatusName = "";
+
+
+}
--
Gitblit v1.8.0