From 63b7d86ec70171ddb2c1cbe0cdddea57c4313889 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期三, 07 四月 2021 14:28:09 +0800
Subject: [PATCH] 社保档位与保险类型字典表合并
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 161 +++++++++++++++++++++++++++++------------------------
1 files changed, 87 insertions(+), 74 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 2a1db68..be59264 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
@@ -48,47 +48,29 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @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 = "员工姓名")
+ @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 = "证件号码")
+ @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 = "jobName", type = "varchar", explain = "岗位名称")
- @TableField("jobName")
- @ExcelField(value = "岗位名称")
- private String jobName = "";
-
+
@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,76 +152,111 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelField(value = "人事处理时间", writeConverter = TimeConverter.class)
private Date hrDoDate;
+
+ @FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
+ @TableField("settleStatus")
+ @ExcelField(value = "状态", writeConverterExp = "0=未结案,1=已结案")
+ private Integer settleStatus = 0;
+
+ @FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
+ @TableField("settleDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
+ private Date settleDate;
+
+
- @FieldInfo(name = "expensesFee", type = "decimal", explain = "医疗总费用")
- @TableField("expensesFee")
- @ExcelField(value = "医疗总费用")
- private BigDecimal expensesFee = BigDecimal.ZERO;
+ @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 = "剔除总额")
+// @ExcelField(value = "剔除总额")
private BigDecimal eliminate = BigDecimal.ZERO;
@FieldInfo(name = "socialDisability", type = "decimal", explain = "一次性伤残补助金")
@TableField("socialDisability")
- @ExcelField(value = "一次性伤残补助金")
+// @ExcelField(value = "一次性伤残补助金")
private BigDecimal socialDisability = BigDecimal.ZERO;
@FieldInfo(name = "socialAllowance", type = "decimal", explain = "住院伙食补贴")
@TableField("socialAllowance")
- @ExcelField(value = "住院伙食补贴")
+// @ExcelField(value = "住院伙食补贴")
private BigDecimal socialAllowance = BigDecimal.ZERO;
@FieldInfo(name = "socialSubsidy", type = "decimal", explain = "一次性医疗补助金")
@TableField("socialSubsidy")
- @ExcelField(value = "一次性医疗补助金")
+// @ExcelField(value = "一次性医疗补助金")
private BigDecimal socialSubsidy = BigDecimal.ZERO;
@FieldInfo(name = "socialCompensation", type = "decimal", explain = "社保赔偿总费用")
@TableField("socialCompensation")
- @ExcelField(value = "社保赔偿总费用")
+// @ExcelField(value = "社保赔偿总费用")
private BigDecimal socialCompensation = BigDecimal.ZERO;
@FieldInfo(name = "compensated", type = "decimal", explain = "已赔付医药费用")
@TableField("compensated")
- @ExcelField(value = "已赔付医药费用")
+// @ExcelField(value = "已赔付医药费用")
private BigDecimal compensated = BigDecimal.ZERO;
@FieldInfo(name = "otherCompensated", type = "decimal", explain = "其他赔偿报销")
@TableField("otherCompensated")
- @ExcelField(value = "其他赔偿报销")
+// @ExcelField(value = "其他赔偿报销")
private BigDecimal otherCompensated = BigDecimal.ZERO;
@FieldInfo(name = "companylDisability", type = "decimal", explain = "公司一次性伤残补助金")
@TableField("companylDisability")
- @ExcelField(value = "公司一次性伤残补助金")
+// @ExcelField(value = "公司一次性伤残补助金")
private BigDecimal companylDisability = BigDecimal.ZERO;
@FieldInfo(name = "companyAllowance", type = "decimal", explain = "工伤生活补贴")
@TableField("companyAllowance")
- @ExcelField(value = "工伤生活补贴")
+// @ExcelField(value = "工伤生活补贴")
private BigDecimal companyAllowance = BigDecimal.ZERO;
@FieldInfo(name = "companySubsidy", type = "decimal", explain = "公司一次性医疗补助金")
@TableField("companySubsidy")
- @ExcelField(value = "公司一次性医疗补助金")
+// @ExcelField(value = "公司一次性医疗补助金")
private BigDecimal companySubsidy = BigDecimal.ZERO;
@FieldInfo(name = "companyCompensation", type = "decimal", explain = "公司赔偿总费用")
@TableField("companyCompensation")
- @ExcelField(value = "公司赔偿总费用")
+// @ExcelField(value = "公司赔偿总费用")
private BigDecimal companyCompensation = BigDecimal.ZERO;
@FieldInfo(name = "jobSubsidy", type = "decimal", explain = "公司一次性就业补助金")
@TableField("jobSubsidy")
- @ExcelField(value = "公司一次性就业补助金")
+// @ExcelField(value = "公司一次性就业补助金")
private BigDecimal jobSubsidy = BigDecimal.ZERO;
- @FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
- @TableField("settleStatus")
- @ExcelField(value = "是否已报告", writeConverterExp = "0=未结案,1=已结案")
- private Integer settleStatus = 0;
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -274,16 +295,10 @@
@FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
@TableField("expenseReport")
- @ExcelField(value = "报单号")
+// @ExcelField(value = "报单号")
private String expenseReport = "";
- @FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
- @TableField("settleDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
- private Date settleDate;
+
@TableField(exist = false)
private String hrDoDateStr= "";
@@ -295,7 +310,5 @@
@TableField(exist = false)
private String settleStatusName = "";
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
--
Gitblit v1.8.0