From 6d05ae432c4d76e521e031a76232a6dd1b0ff105 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 09:20:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
index 621581a..0668bec 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
@@ -1,13 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
-import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -19,8 +20,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* name:EmpJobchange
@@ -51,17 +54,20 @@
@ApiOperation(value = "员工调岗记录翻页列表")
@GetMapping("list")
public FebsResponse empJobchangeList(QueryRequest request, EmpJobChange empJobchange) {
- Map
- <String, Object> dataTable = FebsUtil.getDataTable(this.empJobchangeService.findEmpJobChanges(request, empJobchange));
+ Map <String, Object> dataTable = FebsUtil.getDataTable(this.empJobchangeService.findEmpJobChanges(request, empJobchange));
return new FebsResponse().data(dataTable);
}
@ApiOperation(value = "导出员工")
@RequestMapping(value = "export",method= RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
- public void export(QueryRequest request, EmpJobChange empBaseinfo, HttpServletResponse response) {
+ public void export(QueryRequest request, EmpJobChange empJobchange, HttpServletResponse response) {
request.setPageSize(this.empJobchangeService.count());
- List<EmpJobChange> records = this.empJobchangeService.findEmpJobChanges(request, empBaseinfo).getRecords();
- ExcelKit.$Export(EmpJobChange.class, response).downXlsx(records, false);
+ List<Map<String,Object>> records = this.empJobchangeService.findEmpJobChanges(request, empJobchange).getRecords();
+ List<EmpJobChange> list = records.parallelStream().map(i->{
+ i.put("changeDate", DateUtil.parse(i.get("changeDate").toString()));
+ return BeanUtil.toBean(i,EmpJobChange.class);
+ }).collect(Collectors.toList());
+ ExcelKit.$Export(EmpJobChange.class, response).downXlsx(list, false);
}
@ApiOperation(value = "员工调岗记录增加")
@PostMapping
--
Gitblit v1.8.0