From 36fe021005dc0dfc99590f8d73eeca16f094ce79 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 06 六月 2024 22:33:45 +0800
Subject: [PATCH] fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java | 124 +++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 53 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
index 10ebfcb..068e37c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
@@ -48,27 +48,82 @@
@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 = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
+
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
+ @TableField("certificateNumb")
+ @ExcelField(value = "身份证号码")
+ private String certificateNumb = "";
+
+ @FieldInfo(name = "arbitrationDate", type = "date", explain = "仲裁日期")
+ @TableField("arbitrationDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "仲裁日期", writeConverter = TimeConverter.class)
+ private Date arbitrationDate;
+
+ @FieldInfo(name = "arbitrationTypeName", type = "varchar", explain = "仲裁类型")
+ @TableField(exist = false)
+ @ExcelField(value = "仲裁类型")
+ private String arbitrationTypeName = "";
+
+ @FieldInfo(name = "arbitrationReason", type = "varchar", explain = "仲裁事由")
+ @TableField("arbitrationReason")
+ @ExcelField(value = "仲裁事由")
+ private String arbitrationReason = "";
+
+ @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
+ @TableField("reporter")
+ @ExcelField(value = "汇报人")
+ private String reporter = "";
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ @ExcelField(value = "备注")
+ private String remark = "";
+
+ @FieldInfo(name = "arbitrationPay", type = "decimal", explain = "仲裁赔付（元）")
+ @TableField("arbitrationPay")
+ @ExcelField(value = "仲裁赔付（元）")
+ private BigDecimal arbitrationPay = BigDecimal.ZERO;
+
+ @FieldInfo(name = "arbitrationStatus", type = "bit", explain = "仲裁状态")
+ @TableField("arbitrationStatus")
+ @ExcelField(value = "状态", writeConverterExp = "0=未结案,1=已结案")
+ private Integer arbitrationStatus = 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 = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
- @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
+// @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
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")
@@ -76,7 +131,6 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @ExcelField(value = "部门名称")
private String deptName = "";
//@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -85,53 +139,21 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
- @ExcelField(value = "岗位名称")
+// @ExcelField(value = "岗位名称")
private String jobName = "";
- @FieldInfo(name = "arbitrationDate", type = "date", explain = "仲裁日期")
- @TableField("arbitrationDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "仲裁日期", writeConverter = TimeConverter.class)
- private Date arbitrationDate;
+
@FieldInfo(name = "arbitrationType", type = "varchar", explain = "仲裁类型")
@TableField("arbitrationType")
- @ExcelField(value = "仲裁类型", writeConverterExp = "01=未报告,02=民事纠纷,03=合同纠纷")
private String arbitrationType = "";
- @FieldInfo(name = "arbitrationTypeName", type = "varchar", explain = "仲裁类型")
- @TableField(exist = false)
- private String arbitrationTypeName = "";
-
- @FieldInfo(name = "arbitrationReason", type = "varchar", explain = "仲裁事由")
- @TableField("arbitrationReason")
- @ExcelField(value = "仲裁事由")
- private String arbitrationReason = "";
-
- @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
- @TableField("reporter")
- @ExcelField(value = "报备人")
- private String reporter = "";
-
- @FieldInfo(name = "arbitrationPay", type = "decimal", explain = "仲裁赔付（元）")
- @TableField("arbitrationPay")
- @ExcelField(value = "仲裁赔付（元）")
- private BigDecimal arbitrationPay = BigDecimal.ZERO;
-
- @FieldInfo(name = "arbitrationStatus", type = "bit", explain = "仲裁状态")
- @TableField("arbitrationStatus")
- private Integer arbitrationStatus = 0;
+
+
@TableField(exist = false)
private String arbitrationStatusName ;
- @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 = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -161,12 +183,10 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- private String remark = "";
+
@TableField(exist = false)
private String arbitrationDateStr= "";
@@ -174,7 +194,5 @@
@TableField(exist = false)
private String settleDateStr= "";
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
--
Gitblit v1.8.0