diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d2d1c260..3e3afa3b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,13 +5,6 @@
-
-
-
-
-
-
-
@@ -163,7 +156,7 @@
-
+
@@ -218,17 +211,17 @@
file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java
- 109
+ 106
file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java
- 136
+ 133
file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java
- 215
+ 212
diff --git a/src/main/java/com/lz/common/utils/ExcelUtil.java b/src/main/java/com/lz/common/utils/ExcelUtil.java
index 2a171a54..f3556127 100644
--- a/src/main/java/com/lz/common/utils/ExcelUtil.java
+++ b/src/main/java/com/lz/common/utils/ExcelUtil.java
@@ -1196,5 +1196,33 @@ public class ExcelUtil {
return data;
}
+ /**
+ * 获取模板列表
+ *
+ * @return
+ */
+ public static Map getExcelSheet2HeaderMap() {
+ LinkedHashMap map = new LinkedHashMap<>();
+ map.put(ExcelStaffHeardEnum.findFieldByName("姓名"), "姓名");
+ map.put(ExcelStaffHeardEnum.findFieldByName("项目名称"), "项目名称");
+ map.put(ExcelStaffHeardEnum.findFieldByName("项目工作内容"), "项目工作内容");
+ map.put(ExcelStaffHeardEnum.findFieldByName("项目时间起"), "项目时间起");
+ map.put(ExcelStaffHeardEnum.findFieldByName("项目时间止"), "项目时间止");
+ return map;
+ }
+
+ /**
+ * 获取模板列表
+ *
+ * @return
+ */
+ public static Map getExcelSheet3HeaderMap() {
+ LinkedHashMap map = new LinkedHashMap<>();
+ map.put(ExcelStaffHeardEnum.findFieldByName("姓名"), "姓名");
+ map.put(ExcelStaffHeardEnum.findFieldByName("工作调转时间"), "工作调转时间");
+ map.put(ExcelStaffHeardEnum.findFieldByName("调转记录"), "调转记录");
+ map.put(ExcelStaffHeardEnum.findFieldByName("调转类型"), "调转类型");
+ return map;
+ }
}
diff --git a/src/main/java/com/lz/modules/app/controller/StaffController.java b/src/main/java/com/lz/modules/app/controller/StaffController.java
index 8b1c844f..d05a9e2c 100644
--- a/src/main/java/com/lz/modules/app/controller/StaffController.java
+++ b/src/main/java/com/lz/modules/app/controller/StaffController.java
@@ -1,6 +1,5 @@
package com.lz.modules.app.controller;
-import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
@@ -11,8 +10,6 @@ import com.lz.modules.app.entity.DepartmentsEntity;
import com.lz.modules.app.entity.StaffEntity;
import com.lz.modules.app.enums.ExcelStaffHeardEnum;
import com.lz.modules.app.service.*;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -263,23 +260,25 @@ public class StaffController {
sheet.setDataset(dataList);
list.add(sheet);
-
ExcelSheet> sheet2 = new ExcelSheet<>();
sheet2.setSheetName("员工档案表-离职");
- sheet2.setHeaders(ExcelUtil.getExcelHeaderMap());
+ Map headMap = ExcelUtil.getExcelHeaderMap();
+ headMap.put(ExcelStaffHeardEnum.findFieldByName("离职日期"), "离职日期");
+ headMap.put(ExcelStaffHeardEnum.findFieldByName("离职原因"), "离职原因");
+ sheet2.setHeaders(headMap);
list.add(sheet2);
ExcelSheet> sheet3 = new ExcelSheet<>();
sheet3.setSheetName("员工项目经历");
- sheet3.setHeaders(ExcelUtil.getExcelHeaderMap());
+ sheet3.setHeaders(ExcelUtil.getExcelSheet2HeaderMap());
list.add(sheet3);
ExcelSheet> sheet4 = new ExcelSheet<>();
sheet4.setSheetName("工作调转记录");
- sheet4.setHeaders(ExcelUtil.getExcelHeaderMap());
+ sheet4.setHeaders(ExcelUtil.getExcelSheet3HeaderMap());
list.add(sheet4);
- ExcelUtil.exportExcel(list,"员工信息模版"+DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN),response);
+ ExcelUtil.exportExcel(list, "员工信息模版" + DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN), response);
} catch (IOException e) {
e.printStackTrace();
}