From 9567ebc89e91cc0d39963c9eac108fa09372b6a8 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Wed, 28 May 2025 09:55:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ruoyi):=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=89=88=E6=9C=AC=E5=8F=B7=E8=BE=93=E5=85=A5=E5=92=8C?=
 =?UTF-8?q?=20Excel=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将订单版本号输入类型从 text改为 number，限制在 0 到 100 之间
- 优化 Excel 导入时字符串处理逻辑，增加空值判断和去空格操作
---
 .../src/main/resources/templates/manage/order/edit.html      | 2 +-
 .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
index 4a2cd06d..9d2cc1b5 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
@@ -37,7 +37,7 @@
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">版本号：</label>
                 <div class="col-sm-8">
-                    <input name="versionCode" th:field="*{versionCode}" class="form-control" type="text" max="100" min="0" required>
+                    <input name="versionCode" th:field="*{versionCode}" class="form-control" type="number" max="100" min="0" required>
                 </div>
             </div>
         </div>
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 ee276d92..04ee243a 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
@@ -426,6 +426,9 @@ public class ExcelUtil<T>
                     if (String.class == fieldType)
                     {
                         String s = Convert.toStr(val);
+                        if (StringUtils.isNotEmpty(s)) {
+                            s = s.trim();
+                        }
                         if (StringUtils.endsWith(s, ".0"))
                         {
                             val = StringUtils.substringBefore(s, ".0");
@@ -439,7 +442,7 @@ public class ExcelUtil<T>
                             }
                             else
                             {
-                                val = Convert.toStr(val);
+                                val = s;
                             }
                         }
                     }