From 349b323a358ba85443ac25f52aa0fc11221c8437 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 26 四月 2025 09:07:59 +0800
Subject: [PATCH] 导入修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java | 16 +++++++++-------
ruoyi-service/ruoyi-admin/src/main/resources/template/回收订单导入.xlsx | 0
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java | 4 ++--
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
index 43e19db..d3d1d45 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
@@ -5,6 +5,8 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.io.resource.ClassPathResource;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.large.model.AnalysisOrderData;
@@ -115,16 +117,16 @@
@ApiOperation(value = "回收订单导入模板下载")
@GetMapping("/import-template")
public void importTemplate() {
- List<AnalysisOrderData> contractList = new ArrayList<>();
- Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), AnalysisOrderData.class, contractList);
+ ClassPathResource classPathResource = new ClassPathResource("template/回收订单导入.xlsx");
+ TemplateExportParams params = new TemplateExportParams(classPathResource.getPath());
+ Workbook workbook = ExcelExportUtil.exportExcel(params, new HashMap<>());
HttpServletResponse response = WebUtils.response();
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
ServletOutputStream outputStream = null;
try {
- String fileName = URLEncoder.encode("回收订单导入模板.xls", "utf-8");
- response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
- response.setHeader("content-Type", "application/vnd.ms-excel");
- response.setHeader("Pragma", "no-cache");
- response.setHeader("Cache-Control", "no-cache");
+ String fileName = URLEncoder.encode("回收订单导入.xlsx", "utf-8");
+ response.setHeader("Content-dispodition", "attachment;filename=" + fileName);
outputStream = response.getOutputStream();
workbook.write(outputStream);
} catch (IOException e) {
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
index 46bd01a..48262b0 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
@@ -72,7 +72,7 @@
private String recyclePerson;
@ApiModelProperty(value = "日期")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("order_date")
private Date orderDate;
@@ -85,7 +85,7 @@
@TableField("import_time")
private LocalDateTime importTime;
- @Excel(name = "日期")
+ @Excel(name = "日期(yyyy-MM-dd)")
@TableField(exist = false)
private String orderDateStr;
diff --git "a/ruoyi-service/ruoyi-admin/src/main/resources/template/\345\233\236\346\224\266\350\256\242\345\215\225\345\257\274\345\205\245.xlsx" "b/ruoyi-service/ruoyi-admin/src/main/resources/template/\345\233\236\346\224\266\350\256\242\345\215\225\345\257\274\345\205\245.xlsx"
new file mode 100644
index 0000000..3b2bf0c
--- /dev/null
+++ "b/ruoyi-service/ruoyi-admin/src/main/resources/template/\345\233\236\346\224\266\350\256\242\345\215\225\345\257\274\345\205\245.xlsx"
Binary files differ
--
Gitblit v1.7.1