From 66496c56ad7098a8e6f4945039c3c5fe714b99be Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 18 五月 2024 13:24:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 978c030..9ae2e2c 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -157,7 +157,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- if (entry.getKey().equals("loc_no")) {
+ if (entry.getKey().equals("loc_no") || entry.getKey().equals("locNo")) {
wrapper.eq("loc_no", String.valueOf(entry.getValue()));
locNo=String.valueOf(entry.getValue());
} else {
@@ -542,7 +542,7 @@
}
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- String fileName = URLEncoder.encode("鍑哄叆搴撴槑缁嗗巻鍙�", "UTF-8");
+ String fileName = URLEncoder.encode("鍑哄叆搴撴槑缁嗙粺璁�", "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), WrkDetlLogAllViewParam.class)
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
--
Gitblit v1.9.1