From d425460023114e81caedc7a0430f9246ed3bb839 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 23 十月 2025 17:04:07 +0800
Subject: [PATCH] 报检：批次号字母转大写
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 082041a..15f5db2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -75,7 +75,7 @@
import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.UtilException;
import com.ruoyi.common.utils.DateUtils;
@@ -531,7 +531,7 @@
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
* @return 缁撴灉
*/
- public Result exportExcel(List<T> list, String sheetName)
+ public AjaxResult exportExcel(List<T> list, String sheetName)
{
return exportExcel(list, sheetName, StringUtils.EMPTY);
}
@@ -544,7 +544,7 @@
* @param title 鏍囬
* @return 缁撴灉
*/
- public Result exportExcel(List<T> list, String sheetName, String title)
+ public AjaxResult exportExcel(List<T> list, String sheetName, String title)
{
this.init(list, sheetName, title, Type.EXPORT);
return exportExcel();
@@ -586,7 +586,7 @@
* @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
* @return 缁撴灉
*/
- public Result importTemplateExcel(String sheetName)
+ public AjaxResult importTemplateExcel(String sheetName)
{
return importTemplateExcel(sheetName, StringUtils.EMPTY);
}
@@ -598,7 +598,7 @@
* @param title 鏍囬
* @return 缁撴灉
*/
- public Result importTemplateExcel(String sheetName, String title)
+ public AjaxResult importTemplateExcel(String sheetName, String title)
{
this.init(null, sheetName, title, Type.IMPORT);
return exportExcel();
@@ -657,7 +657,7 @@
*
* @return 缁撴灉
*/
- public Result exportExcel()
+ public AjaxResult exportExcel()
{
OutputStream out = null;
try
@@ -666,7 +666,7 @@
String filename = encodingFilename(sheetName);
out = new FileOutputStream(getAbsoluteFile(filename));
wb.write(out);
- return Result.success(filename);
+ return AjaxResult.success(filename);
}
catch (Exception e)
{
--
Gitblit v1.9.3