From 80bde86f943a8622d39b4d9d0ab056c8829106cd Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期三, 17 三月 2021 01:56:40 +0800
Subject: [PATCH] 智搜导出字段排序修改
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java | 128 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java | 51 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java | 111 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 123 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java | 29
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java | 7
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java | 68 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java | 84 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java | 93 ++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java | 122 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 155 +++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 14
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java | 57 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 95 ++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java | 118 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 55 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml | 1
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 117 ++--
19 files changed, 798 insertions(+), 634 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
index 31568c3..c165856 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
@@ -66,7 +66,7 @@
/**
* 仲裁类型
*/
- public final static String ARBITRATIONTYPE = "ARBITRATIONTYPE";
+ public final static String ZCTYPE = "ZCTYPE";
/**
* 结案状态
@@ -82,4 +82,9 @@
* 岗位变更类型
*/
public final static String JOB_CHANGE_TYPE = "changeType";
+
+ /**
+ * 社保档位
+ */
+ public final static String INSURANCE_GAERS = "insuranceGaers";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
index 3808ad4..41abd87 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
@@ -50,72 +50,55 @@
@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 = "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")
- 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)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelField(value = "受伤时间", writeConverter = TimeConverter.class)
+ @ExcelField(value = "受伤日期", writeConverter = TimeConverter.class)
private Date injuredTime;
-
+
@FieldInfo(name = "injuredAddress", type = "varchar", explain = "受伤地点")
@TableField("injuredAddress")
@ExcelField(value = "受伤地点")
private String injuredAddress = "";
-
+
@FieldInfo(name = "injuredPart", type = "varchar", explain = "受伤部位")
@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 = "就诊医院")
@@ -130,13 +113,12 @@
@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 = "床号")
private String bedNumb = "";
-
+
@FieldInfo(name = "reprotTime", type = "date", explain = "报案时间")
@TableField("reprotTime")
@JsonSerialize(using = DateSerializer.class)
@@ -162,16 +144,16 @@
@TableField("expensesFee")
@ExcelField(value = "医疗总费用")
private BigDecimal expensesFee = BigDecimal.ZERO;
-
- @FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
- @TableField("expenseReport")
- @ExcelField(value = "报单号")
- private String expenseReport = "";
-
+
@FieldInfo(name = "innsureFee", type = "decimal", explain = "保险赔付费用")
@TableField("innsureFee")
@ExcelField(value = "保险赔付费用")
private BigDecimal innsureFee = BigDecimal.ZERO;
+
+ @FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
+ @TableField("expenseReport")
+ @ExcelField(value = "保单")
+ private String expenseReport = "";
@FieldInfo(name = "hrDoDate", type = "date", explain = "人事处理时间")
@TableField("hrDoDate")
@@ -180,25 +162,56 @@
@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 = "案结日期")
+ @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)
+ @ExcelField(value = "结案时间", writeConverter = TimeConverter.class)
private Date settleDate;
+
+
- @FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
- @TableField("settleStatus")
- @ExcelField(value = "结案状态", writeConverterExp = "0=未结案,1=已结案")
- private Integer settleStatus = 0;
+ @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 ;
+
+
@TableField(exist = false)
private String settleStatusName;
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
- @ExcelField(value = "备注")
+// @ExcelField(value = "备注")
private String remark = "";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -238,8 +251,5 @@
@TableField(exist = false)
private String hrDoDateStr;
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
index f1aa9dc..e0d9a69 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
@@ -43,25 +43,55 @@
@TableField("empId")
private Long empId = 0L;
- @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
- @TableField("empName")
- @ExcelField(value = "姓名")
- private String empName = "";
-
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
@ExcelField(value = "编号")
private String empNumb = "";
-
- @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
- @TableField("sex")
- @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
- private String sex = "";
-
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
+ @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 = "badDate", type = "date", explain = "不良记录日期")
+ @TableField("badDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "不良记录日期", writeConverter = TimeConverter.class)
+ private Date badDate;
+
+ @FieldInfo(name = "badContent", type = "varchar", explain = "不良记录描述")
+ @TableField("badContent")
+ @ExcelField(value = "不良记录描述")
+ private String badContent = "";
+
+ @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 = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ private String sex = "";
+
+
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
@@ -77,26 +107,9 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
- @ExcelField(value = "岗位名称")
+// @ExcelField(value = "岗位名称")
private String jobName = "";
-
- @FieldInfo(name = "badDate", type = "date", explain = "不良记录日期")
- @TableField("badDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "不良记录日期", writeConverter = TimeConverter.class)
- private Date badDate;
-
- @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
- @TableField("reporter")
- @ExcelField(value = "报备人")
- private String reporter = "";
-
- @FieldInfo(name = "badContent", type = "varchar", explain = "不良记录描述")
- @TableField("badContent")
- @ExcelField(value = "不良记录描述")
- private String badContent = "";
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -129,20 +142,15 @@
@Version
private Integer version = 0;
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- private String remark = "";
+
@TableField(exist = false)
private String badDateStr= "";
@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 = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
index 7f6d7b2..76a9b32 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
@@ -47,25 +47,64 @@
@TableField("empNumb")
@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 = "姓名")
private String empName = "";
-
- @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
- @TableField("empStatus")
- @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
- private String empStatus = "";
-
+
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
@ExcelField(value = "身份证号码")
private String certificateNumb = "";
+
+ @FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
+ @TableField("signingDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "合同签订日期", writeConverter = TimeConverter.class)
+ private Date signingDate;
+
+ @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
+ @TableField("endDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "合同结束日期", writeConverter = TimeConverter.class)
+ private Date endDate;
+
+ @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @TableField("contractPeriod")
+ @ExcelField(value = "合同期限(年)")
+ private Integer contractPeriod = 0;
+
+ @FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
+ @TableField(exist = false)
+ @ExcelField(value = "合同状态")
+ private String contractStatusName = "";
+
+ @FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
+ @TableField("transactor")
+ @ExcelField(value = "合同办理人")
+ private String transactor = "";
+
+
+ @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=女")
+// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -82,7 +121,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
- @ExcelField(value = "岗位名称")
+// @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
@@ -90,43 +129,16 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "开始日期", writeConverter = TimeConverter.class)
+// @ExcelField(value = "开始日期", writeConverter = TimeConverter.class)
private Date beginDate;
-
- @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
- @TableField("endDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "结束日期", writeConverter = TimeConverter.class)
- private Date endDate;
@FieldInfo(name = "contractStatus", type = "varchar", explain = "合同状态")
@TableField("contractStatus")
- @ExcelField(value = "合同状态", writeConverterExp = "1=有效,2=到期,3=续签,4=存档")
private String contractStatus = "";
-
- @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
- @TableField("contractPeriod")
- @ExcelField(value = "合同期限(年)")
- private Integer contractPeriod = 0;
-
- @FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
- @TableField("transactor")
- @ExcelField(value = "合同办理人")
- private String transactor = "";
-
- @FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
- @TableField("signingDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "合同签订日期", writeConverter = TimeConverter.class)
- private Date signingDate;
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
- @ExcelField(value = "备注")
+// @ExcelField(value = "备注")
private String remark = "";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -166,13 +178,8 @@
@TableField(exist = false)
private String endDateStr = "";
- @FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
- @TableField(exist = false)
- private String contractStatusName = "";
+
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
index 689a7b0..9257235 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
@@ -49,25 +49,82 @@
@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 = "attendMonth", type = "varchar", explain = "离职考勤月份")
+ @TableField("attendMonth")
+ @ExcelField(value = "离职考勤年月")
+ private String attendMonth = "";
+
+ @FieldInfo(name = "attendDays", type = "decimal", explain = "出勤天数")
+ @TableField("attendDays")
+ @ExcelField(value = "出勤天数")
+ private BigDecimal attendDays = BigDecimal.ZERO;
+
+ @FieldInfo(name = "overtimeDay", type = "decimal", explain = "加班（天）")
+ @TableField("overtimeDay")
+ @ExcelField(value = "加班（天）")
+ private BigDecimal overtimeDay = BigDecimal.ZERO;
+
+ @FieldInfo(name = "overtimeHour", type = "decimal", explain = "加班小时")
+ @TableField("overtimeHour")
+ @ExcelField(value = "加班（小时）")
+ private BigDecimal overtimeHour = BigDecimal.ZERO;
+
+ @FieldInfo(name = "deduct", type = "varchar", explain = "有无代扣款项")
+ @TableField("deduct")
+ @ExcelField(value = "有无代扣款项")
+ private String deduct = "";
+
+ @FieldInfo(name = "leaveDay", type = "decimal", explain = "请假（天）")
+ @TableField("leaveDay")
+ @ExcelField(value = "请假（天）")
+ private BigDecimal leaveDay = BigDecimal.ZERO;
+
+ @FieldInfo(name = "absenteeism", type = "decimal", explain = "旷工（天）")
+ @TableField("absenteeism")
+ @ExcelField(value = "旷工（天）")
+ private BigDecimal absenteeism = BigDecimal.ZERO;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ @ExcelField(value = "备注")
+ private String remark = "";
+
+
+ @FieldInfo(name = "attendYear", type = "varchar", explain = "离职考勤年份")
+ @TableField(exist = false)
+// @ExcelField(value = "考勤年份")
+ private String attendYear = "";
+
+
@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")
- @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+// @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")
@@ -82,50 +139,7 @@
@TableField("JobId")
private Long jobId = 0L;
- @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
- @TableField("jobName")
- @ExcelField(value = "岗位名称")
- private String jobName = "";
-
- @FieldInfo(name = "attendYear", type = "varchar", explain = "离职考勤年份")
- @TableField(exist = false)
- @ExcelField(value = "考勤年份")
- private String attendYear = "";
-
- @FieldInfo(name = "attendMonth", type = "varchar", explain = "离职考勤月份")
- @TableField("attendMonth")
- @ExcelField(value = "考勤月份")
- private String attendMonth = "";
-
- @FieldInfo(name = "attendDays", type = "decimal", explain = "出勤天数")
- @TableField("attendDays")
- @ExcelField(value = "出勤天数")
- private BigDecimal attendDays = BigDecimal.ZERO;
-
- @FieldInfo(name = "overtimeHour", type = "decimal", explain = "加班小时")
- @TableField("overtimeHour")
- @ExcelField(value = "加班小时")
- private BigDecimal overtimeHour = BigDecimal.ZERO;
-
- @FieldInfo(name = "overtimeDay", type = "decimal", explain = "加班（天）")
- @TableField("overtimeDay")
- @ExcelField(value = "加班（天）")
- private BigDecimal overtimeDay = BigDecimal.ZERO;
-
- @FieldInfo(name = "leaveDay", type = "decimal", explain = "请假（天）")
- @TableField("leaveDay")
- @ExcelField(value = "请假（天）")
- private BigDecimal leaveDay = BigDecimal.ZERO;
-
- @FieldInfo(name = "deduct", type = "varchar", explain = "有无代扣款项")
- @TableField("deduct")
- @ExcelField(value = "有无代扣款项")
- private String deduct = "";
-
- @FieldInfo(name = "absenteeism", type = "decimal", explain = "旷工（天）")
- @TableField("absenteeism")
- @ExcelField(value = "旷工（天）")
- private BigDecimal absenteeism = BigDecimal.ZERO;
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -158,15 +172,8 @@
@Version
private Integer version = 0;
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- private String remark = "";
-
@TableField(exist = false)
private String deductStr;
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
index 8d5ce5a..e96d2fb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
@@ -44,6 +44,23 @@
//@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
+
+ @TableField(exist = false)
+ @ExcelField(value = "员工编号")
+ private String empNumb= "";
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @TableField(exist = false)
+ @ExcelField(value = "部门(护卫点)")
+ private String allDeptName = "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "岗位")
+ private String newJobName= "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "姓名")
+ private String empName = "";
@FieldInfo(name = "entryDate", type = "date", explain = "入职日期")
@TableField("entryDate")
@@ -60,26 +77,30 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelField(value = "离职日期", writeConverter = TimeConverter.class)
private Date dimissionDate;
-
- @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
- @TableField("dimissionType")
- @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
- private String dimissionType = "1";
-
+
@FieldInfo(name = "selfLeaveDay", type = "decimal", explain = "自离天数")
@TableField("selfLeaveDay")
@ExcelField(value = "自离天数")
private BigDecimal selfLeaveDay = BigDecimal.ZERO;
-
+
+
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
- @ExcelField(value = "报备人")
+ @ExcelField(value = "报告人")
private String reporter = "";
-
+
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
@ExcelField(value = "备注")
private String remark = "";
+
+ @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
+ @TableField("dimissionType")
+// @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
+ private String dimissionType = "1";
+
+
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -130,25 +151,19 @@
private String afterOperation= "";
@TableField(exist = false)
- @ExcelField(value = "身份证号码")
+// @ExcelField(value = "身份证号码")
private String certificateNumb= "";
- @TableField(exist = false)
- @ExcelField(value = "员工编号")
- private String empNumb= "";
+
@TableField(exist = false)
- @ExcelField(value = "新部门")
+// @ExcelField(value = "新部门")
private String newDeptName= "";
- @TableField(exist = false)
- @ExcelField(value = "新岗位")
- private String newJobName= "";
+
@TableField(exist = false)
private String empStatus;
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
index e919ffc..4a658e3 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
@@ -47,26 +47,78 @@
@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 = "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 = "applayDate", type = "date", explain = "申请日期")
+ @TableField("applayDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "社保申请日期", writeConverter = TimeConverter.class)
+ private Date applayDate;
+
+ @FieldInfo(name = "proposer", type = "varchar", explain = "申请人")
+ @TableField("proposer")
+ @ExcelField(value = "申请人")
+ private String proposer = "";
+
+ @FieldInfo(name = "insuranceGaers", type = "varchar", explain = "社保档位")
+ @TableField("insuranceGaers")
+ private String insuranceGaers = "";
+
+ @ExcelField(value = "社保档位")
+ private String insuranceGaersName = "";
+
+ @FieldInfo(name = "reportStatus", type = "bit", explain = "是否已报告1-未报告 2-已报告")
+ @TableField("reportStatus")
+ @ExcelField(value = "是否已报告", writeConverterExp = "1=未报告,2=已报告")
+ private Integer reportStatus = 0;
+
+ @FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 1-未申请 2-已申请")
+ @TableField("applayStatus")
+ @ExcelField(value = "状态", writeConverterExp = "1=未申请,2=已申请")
+ private Integer applayStatus = 0;
+
+ @FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
+ @TableField("auditor")
+ @ExcelField(value = "审核人")
+ private String auditor = "";
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ @ExcelField(value = "备注")
+ private String remark = "";
+
+
+
+ @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")
@@ -80,46 +132,16 @@
@TableField("JobId")
private Long jobId = 0L;
- @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
- @TableField("jobName")
- @ExcelField(value = "岗位名称")
- private String jobName = "";
-
- @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
- @TableField("applayDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "申请日期", writeConverter = TimeConverter.class)
- private Date applayDate;
-
- @FieldInfo(name = "proposer", type = "varchar", explain = "申请人")
- @TableField("proposer")
- @ExcelField(value = "申请人")
- private String proposer = "";
-
- @FieldInfo(name = "insuranceGaers", type = "varchar", explain = "社保档位")
- @TableField("insuranceGaers")
- @ExcelField(value = "社保档位")
- private String insuranceGaers = "";
-
- @FieldInfo(name = "reportStatus", type = "bit", explain = "是否已报告 0-未报告 1-已报告")
- @TableField("reportStatus")
- @ExcelField(value = "是否已报告", writeConverterExp = "0=未报告,1=已报告")
- private Integer reportStatus = 0;
+
+
@TableField(exist = false)
private String reportStatusName ;
- @FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 0-未申请 1-已申请")
- @TableField("applayStatus")
- @ExcelField(value = "申请状态", writeConverterExp = "0=未申请,1=已申请")
- private Integer applayStatus = 0;
+
@TableField(exist = false)
private String applayStatusName ;
- @FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
- @TableField("auditor")
- @ExcelField(value = "审核人")
- private String auditor = "";
+
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -152,15 +174,10 @@
@Version
private Integer version = 0;
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- private String remark = "";
+
@TableField(exist = false)
private String applayDateStr;
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
index b407d53..5d138cf 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
@@ -42,6 +42,20 @@
//@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
+
+ @ExcelField(value = "员工编号")
+ @TableField(exist = false)
+ private String empNumb="";
+
+ @FieldInfo(name = "newDeptName", type = "varchar", explain = "新部门")
+ @TableField("newDeptName")
+ @ExcelField(value = "现部门(护卫点)")
+ private String newDeptName = "";
+
+ @FieldInfo(name = "newJobName", type = "varchar", explain = "新岗位")
+ @TableField("newJobName")
+ @ExcelField(value = "现岗位")
+ private String newJobName = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
@@ -50,41 +64,37 @@
@FieldInfo(name = "oldDeptName", type = "varchar", explain = "原部门")
@TableField("oldDeptName")
- @ExcelField(value = "原部门")
+ @ExcelField(value = "原部门(护卫点)")
private String oldDeptName = "";
@FieldInfo(name = "oldJobName", type = "varchar", explain = "原岗位")
@TableField("oldJobName")
@ExcelField(value = "原岗位")
private String oldJobName = "";
-
- @FieldInfo(name = "newDeptName", type = "varchar", explain = "新部门")
- @TableField("newDeptName")
- @ExcelField(value = "新部门")
- private String newDeptName = "";
-
- @FieldInfo(name = "newJobName", type = "varchar", explain = "新岗位")
- @TableField("newJobName")
- @ExcelField(value = "新岗位")
- private String newJobName = "";
-
- @FieldInfo(name = "changeType", type = "varchar", explain = "调岗类型")
- @TableField("changeType")
- // @ExcelField(value = "调岗类型",writeConverterExp = "2=升职,3=调动")
- private String changeType = "";
-
+
@FieldInfo(name = "changeDate", type = "date", explain = "调岗位日期")
@TableField("changeDate")
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "调岗位日期", writeConverter = TimeConverter.class)
+ @ExcelField(value = "调岗日期", writeConverter = TimeConverter.class)
private Date changeDate;
+ @FieldInfo(name = "changeTypeName", type = "varchar", explain = "调岗类型")
+ @TableField(exist = false)
+ @ExcelField(value = "调岗类型")
+ private String changeTypeName = "";
+
@FieldInfo(name = "changeReason", type = "varchar", explain = "调岗原因")
@TableField("changeReason")
- @ExcelField(value = "调岗原因")
+ @ExcelField(value = "调岗理由描述")
private String changeReason = "";
+
+ @FieldInfo(name = "changeType", type = "varchar", explain = "调岗类型")
+ @TableField("changeType")
+ // @ExcelField(value = "调岗类型",writeConverterExp = "2=升职,3=调动")
+ private String changeType = "";
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -147,9 +157,7 @@
@TableField(exist = false)
private String deptName= "";
- @ExcelField(value = "员工编号")
- @TableField(exist = false)
- private String empNumb="";
+
@ExcelField(value = "身份证号码")
@TableField(exist = false)
@@ -162,9 +170,6 @@
@TableField(exist = false)
private String allDeptName = "";
- @FieldInfo(name = "changeTypeName", type = "varchar", explain = "调岗类型")
- @TableField(exist = false)
- @ExcelField(value = "调岗类型")
- private String changeTypeName = "";
+
}
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 9a6463a..aceccc8 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
@@ -50,25 +50,80 @@
@TableField("empNumb")
@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 = "姓名")
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")
@@ -84,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")
@@ -163,9 +186,7 @@
@Version
private Integer version = 0;
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- private String remark = "";
+
@TableField(exist = false)
private String arbitrationDateStr= "";
@@ -173,8 +194,5 @@
@TableField(exist = false)
private String settleDateStr= "";
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
index 15318d6..8921551 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
@@ -50,44 +50,22 @@
@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 = "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")
- 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 = "beginTime", type = "datetime", explain = "开始时间")
@TableField("beginTime")
@JsonSerialize(using = DateTimeSerializer.class)
@@ -103,34 +81,68 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelField(value = "结束时间", writeConverter = TimeConverter.class)
private Date endTime;
-
- @FieldInfo(name = "leaveType", type = "varchar", explain = "请假类型")
- @TableField("leaveType")
- @ExcelField(value = "请假类型", writeConverterExp = "1=事假,2=病假")
- private String leaveType = "";
-
- @FieldInfo(name = "leaveTypeName", type = "varchar", explain = "请假类型")
- @TableField(exist = false)
- private String leaveTypeName = "";
-
-
+
@FieldInfo(name = "leaveDay", type = "decimal", explain = "请假天数")
@TableField("leaveDay")
@ExcelField(value = "请假天数")
private BigDecimal leaveDay = BigDecimal.ZERO;
-
- @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
- @TableField("reporter")
- @ExcelField(value = "报备人")
- private String reporter = "";
-
+
+ @FieldInfo(name = "leaveTypeName", type = "varchar", explain = "请假类型")
+ @TableField(exist = false)
+ @ExcelField(value = "请假类型")
+ private String leaveTypeName = "";
+
@FieldInfo(name = "returnDate", type = "date", explain = "到岗时间")
@TableField("returnDate")
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "到岗时间", writeConverter = TimeConverter.class)
+ @ExcelField(value = "返岗时间", writeConverter = TimeConverter.class)
private Date returnDate;
+
+ @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 = "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")
+ private String deptName = "";
+
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
+
+
+ @FieldInfo(name = "leaveType", type = "varchar", explain = "请假类型")
+ @TableField("leaveType")
+// @ExcelField(value = "请假类型", writeConverterExp = "1=事假,2=病假")
+ private String leaveType = "";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -163,15 +175,9 @@
@Version
private Integer version = 0;
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- private String remark = "";
@TableField(exist = false)
private String leaveDateStr= "";
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
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 2028f71..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
@@ -50,44 +50,27 @@
@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 = "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")
- 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)
@@ -105,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 = "就诊医院")
@@ -130,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 = "床号")
@@ -157,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)
@@ -165,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")
@@ -273,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= "";
@@ -294,8 +310,5 @@
@TableField(exist = false)
private String settleStatusName = "";
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
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 9790389..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
@@ -46,49 +46,37 @@
@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 = "empStatus", type = "varchar", explain = "员工状态")
- @TableField("empStatus")
- @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
- private String empStatus = "";
-
+
@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 = "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;
-
- @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
- @TableField("jobName")
- @ExcelField(value = "岗位名称")
- private String jobName = "";
-
+
@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)
@@ -96,27 +84,27 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelField(value = "体检日期", writeConverter = TimeConverter.class)
private Date physicalExamDate;
-
- @FieldInfo(name = "physicalExamType", type = "varchar", explain = "体检类型")
- @TableField("physicalExamType")
- @ExcelField(value = "体检类型", writeConverterExp = "1=入职体检,2=员工体检")
- private String physicalExamType = "";
-
+
+ @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 = "ecg", type = "varchar", explain = "心电图")
- @TableField("ecg")
+
+ @FieldInfo(name = "ecgName", type = "varchar", explain = "心电图")
+ @TableField(exist = false)
@ExcelField(value = "心电图")
- private String ecg = "";
-
+ private String ecgName = "";
+
@FieldInfo(name = "conclusion", type = "varchar", explain = "体检结论")
@TableField("conclusion")
@ExcelField(value = "体检结论")
@@ -131,6 +119,38 @@
@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 = "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 = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
+
+
+
+
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -166,16 +186,9 @@
@TableField(exist = false)
private String physicalExamDateStr = "";
- @FieldInfo(name = "physicalExamTypeName", type = "varchar", explain = "体检类型")
- @TableField(exist = false)
- private String physicalExamTypeName = "";
+
- @FieldInfo(name = "ecgName", type = "varchar", explain = "心电图")
- @TableField(exist = false)
- private String ecgName = "";
+
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
index 0032f05..3e88f32 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
@@ -47,20 +47,43 @@
@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 = "remarkDate", type = "date", explain = "备注日期")
+ @TableField("remarkDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "备注日期", writeConverter = TimeConverter.class)
+ private Date remarkDate;
+
+ @FieldInfo(name = "remarkContent", type = "varchar", explain = "备注内容")
+ @TableField("remarkContent")
+ @ExcelField(value = "备注内容")
+ private String remarkContent = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别")
@TableField("sex")
- @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+// @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")
@@ -74,24 +97,9 @@
//@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 = "remarkContent", type = "varchar", explain = "备注内容")
- @TableField("remarkContent")
- @ExcelField(value = "备注内容")
- private String remarkContent = "";
-
- @FieldInfo(name = "remarkDate", type = "date", explain = "备注日期")
- @TableField("remarkDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "备注日期", writeConverter = TimeConverter.class)
- private Date remarkDate;
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -130,8 +138,5 @@
@TableField(exist = false)
private String empStatus;
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
index bcdc4bd..4b4f4ba 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
@@ -47,6 +47,16 @@
@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")
@@ -55,13 +65,38 @@
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
- @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
@ExcelField(value = "身份证号码")
private String certificateNumb = "";
+
+ @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
+ @TableField("applayDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "辞职申请日期", writeConverter = TimeConverter.class)
+ private Date applayDate;
+
+ @FieldInfo(name = "reason", type = "varchar", explain = "事由")
+ @TableField("reason")
+ @ExcelField(value = "辞职事由")
+ private String reason = "";
+
+ @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 = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
@@ -75,28 +110,10 @@
@TableField("JobId")
private Long jobId = 0L;
- @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
- @TableField("jobName")
- @ExcelField(value = "岗位名称")
- private String jobName = "";
- @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
- @TableField("applayDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "申请日期", writeConverter = TimeConverter.class)
- private Date applayDate;
+
- @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
- @TableField("reporter")
- @ExcelField(value = "报备人")
- private String reporter = "";
-
- @FieldInfo(name = "reason", type = "varchar", explain = "事由")
- @TableField("reason")
- @ExcelField(value = "事由")
- private String reason = "";
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -129,9 +146,7 @@
@Version
private Integer version = 0;
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- private String remark = "";
+
@TableField(exist = false)
private String applayDateStr;
@@ -139,8 +154,5 @@
@TableField(exist = false)
private String empStatus;
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
index e732339..8144fbb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
@@ -46,21 +46,63 @@
@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 = "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 = "applayDate", type = "date", explain = "申请日期")
+ @TableField("applayDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "失业金申请日期", writeConverter = TimeConverter.class)
+ private Date applayDate;
+
+ @FieldInfo(name = "applayReason", type = "varchar", explain = "申报事由")
+ @TableField("applayReason")
+ @ExcelField(value = "申报事由")
+ private String applayReason = "";
+
+ @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
+ @TableField("reporter")
+ @ExcelField(value = "汇报人")
+ private String reporter = "";
+
+ @FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
+ @TableField("auditor")
+ @ExcelField(value = "审核人")
+ private String auditor = "";
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ @ExcelField(value = "备注")
+ private String remark = "";
+
+
+
+ @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")
@@ -74,39 +116,7 @@
@TableField("JobId")
private Long jobId = 0L;
- @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
- @TableField("jobName")
- @ExcelField(value = "岗位名称")
- private String jobName = "";
-
- @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
- @TableField("applayDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "申请日期", writeConverter = TimeConverter.class)
- private Date applayDate;
-
- @FieldInfo(name = "applayReason", type = "varchar", explain = "申报事由")
- @TableField("applayReason")
- @ExcelField(value = "申报事由")
- private String applayReason = "";
-
- @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
- @TableField("reporter")
- @ExcelField(value = "报备人")
- private String reporter = "";
-
- @FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
- @TableField("auditor")
- @ExcelField(value = "审核人")
- private String auditor = "";
-
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- @ExcelField(value = "备注")
- private String remark = "";
-
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -145,8 +155,5 @@
@TableField(exist = false)
private String empStatus;
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
index d60731f..6c340c6 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
@@ -51,21 +51,27 @@
@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 = "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 = "workUnit", type = "varchar", explain = "工作单位")
+ @TableField("workUnit")
+ @ExcelField(value = "工作单位")
+ private String workUnit;
+
+ @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")
@@ -81,13 +87,10 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
- @ExcelField(value = "岗位名称")
+// @ExcelField(value = "岗位名称")
private String jobName = "";
- @FieldInfo(name = "workUnit", type = "varchar", explain = "工作单位")
- @TableField("workUnit")
- @ExcelField(value = "工作单位")
- private String workUnit;
+
@FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
@TableField("beginDate")
@@ -142,7 +145,7 @@
private Integer version;
@FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
+// @ExcelField(value = "部门(护卫点)")
@TableField(exist = false)
private String allDeptName = "";
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml
index 25a2360..801c062 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml
@@ -4,6 +4,7 @@
<select id="selectPageVo" resultType="java.util.Map">
select a.*,b.empNumb,b.certificateNumb,b.empName,
(select dept_Name from t_dept as dept where dept.dept_Id= b.deptId) as newDeptName,
+ (select allDeptName from t_dept as dept where dept.dept_Id= b.deptId) as allDeptName,
b.jobName as newJobName from t_emp_dimissionlog a
inner join t_emp_baseinfo b on a.empId = b.empId
inner join t_dept c on b.deptId = c.DEPT_ID
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
index 3d8806e..2355373 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.DicItem;
@@ -89,7 +90,18 @@
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
- return empInsuranceMapper.selectPageVo(page, queryWrapper);
+ IPage<EmpInsurance> iPage = empInsuranceMapper.selectPageVo(page, queryWrapper);
+ List<EmpInsurance> list = iPage.getRecords();
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.forEach(p -> {
+ p.setInsuranceGaersName(dicItems.stream()
+ .filter(k -> DicCode.INSURANCE_GAERS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getInsuranceGaers()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse("未知"));
+ });
+ iPage.setRecords(list);
+ return iPage;
}
@Override
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index 8396ad8..49f7e84 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -239,10 +239,10 @@
list.forEach(p -> {
//仲裁类型
p.setArbitrationTypeName(dicItems.stream()
- .filter(k -> DicCode.ARBITRATIONTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getArbitrationType()))
+ .filter(k -> DicCode.ZCTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getArbitrationType()))
.findFirst()
.map(DicItem::getDicItemName)
- .orElse("劳资纠纷"));
+ .orElse(""));
});
return list;
--
Gitblit v1.8.0