From 4d94726acad17e5cdcf828e21cab762e8b39921c Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 21:52:47 +0800
Subject: [PATCH] #字段结果
---
server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java | 4 ++--
server/src/main/java/doumeemes/api/business/SalaryParamController.java | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/business/SalaryParamController.java b/server/src/main/java/doumeemes/api/business/SalaryParamController.java
index 7d71e9b..98dfe1b 100644
--- a/server/src/main/java/doumeemes/api/business/SalaryParamController.java
+++ b/server/src/main/java/doumeemes/api/business/SalaryParamController.java
@@ -6,6 +6,7 @@
import doumeemes.core.model.ApiResponse;
import doumeemes.core.model.PageWrap;
import doumeemes.core.model.PageData;
+import doumeemes.core.utils.DateUtil;
import doumeemes.dao.business.model.SalaryParam;
import doumeemes.dao.business.vo.SalaryParamVO;
import doumeemes.dao.ext.dto.SalaryParamDTO;
@@ -24,6 +25,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -88,7 +91,7 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:salaryparam:exportExcel")
public void exportExcel (@RequestBody PageWrap<SalaryParamDTO> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(SalaryParamVO.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response);
+ ExcelExporter.build(SalaryParamVO.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�"+ LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")), response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
diff --git a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
index cb4da76..c362faa 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
@@ -18,7 +18,7 @@
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�",index = 11)
+ @ExcelColumn(name="鍒涘缓浜哄悕绉�",index = 11)
private String createUserName;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@@ -71,7 +71,7 @@
@ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�",index =8)
private String times;
- @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
+ @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏�")
@ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�",index = 9 ,valueMapping = "0=鍚�;1=鏄�")
private Integer unqualified;
--
Gitblit v1.9.3