From 2467978ddf7cbd4624e5d2515ffe3c089dbfd310 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期三, 17 三月 2021 02:45:29 +0800
Subject: [PATCH] 备注导出日期修改为没有时分秒格式，员工信息增加入离职类型的导出
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/DateUtil.java | 2 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java | 3 ++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 3 ++-
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/DateConverter.java | 40 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/DateConverter.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/DateConverter.java
new file mode 100644
index 0000000..2e3ff18
--- /dev/null
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/DateConverter.java
@@ -0,0 +1,40 @@
+package cc.mrbird.febs.common.core.converter;
+
+import java.text.ParseException;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.wuwenze.poi.convert.WriteConverter;
+import com.wuwenze.poi.exception.ExcelKitWriteConverterException;
+
+import cc.mrbird.febs.common.core.utils.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Execl导出时间类型字段格式化
+ *
+ * @author MrBird
+ */
+@Slf4j
+public class DateConverter implements WriteConverter {
+ @Override
+ public String convert(Object value) {
+ if (value == null) {
+ return StringUtils.EMPTY;
+ } else {
+ try {
+ if (StrUtil.isNotBlank(value.toString())&&value.toString().length()==10){
+ return value.toString();
+ }else{
+ return DateUtil.formatCstTime(value.toString(), DateUtil.FULL_DATE_SPLIT_PATTERN);
+ }
+
+ } catch (ParseException e) {
+ String message = "时间转换异常";
+ log.error(message, e);
+ throw new ExcelKitWriteConverterException(message);
+ }
+ }
+ }
+}
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/DateUtil.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/DateUtil.java
index 54dc892..29a32b8 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/DateUtil.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/DateUtil.java
@@ -20,6 +20,8 @@
public static final String FULL_TIME_PATTERN = "yyyyMMddHHmmss";
public static final String FULL_TIME_SPLIT_PATTERN = "yyyy-MM-dd HH:mm:ss";
+
+ public static final String FULL_DATE_SPLIT_PATTERN = "yyyy-MM-dd";
public static final String CST_TIME_PATTERN = "EEE MMM dd HH:mm:ss zzz yyyy";
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index 5dfddf3..44be67a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -315,7 +315,7 @@
@TableField("entryType")
private String entryType = "";
- //@FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
+ @FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
@TableField(exist = false)
private String entryTypeName = "新入职";
@@ -366,6 +366,7 @@
@TableField(exist = false)
private String dimissionDateStr= "";
+ @FieldInfo(name = "dimissionTypeName", type = "varchar", explain = "离职类型")
@TableField(exist = false)
private String dimissionTypeName= "";
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 3e88f32..f63249a 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
@@ -4,6 +4,7 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.DateConverter;
import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
@@ -68,7 +69,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "备注日期", writeConverter = TimeConverter.class)
+ @ExcelField(value = "备注日期", writeConverter = DateConverter.class)
private Date remarkDate;
@FieldInfo(name = "remarkContent", type = "varchar", explain = "备注内容")
--
Gitblit v1.8.0