From fe622b9648b86ffb6e4e7e164f98541ca43c3904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=92?= <van666666@foxmail.com>
Date: Sun, 5 Oct 2025 02:25:01 +0800
Subject: [PATCH] 1

---
 .../src/main/java/com/ruoyi/jarvis/domain/OrderRows.java  | 8 ++++++++
 .../ruoyi/jarvis/service/impl/InstructionServiceImpl.java | 2 +-
 .../src/main/resources/mapper/jarvis/OrderRowsMapper.xml  | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java
index 64eaaff..f90a43d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java
@@ -229,4 +229,12 @@ public class OrderRows extends BaseEntity
     @Excel(name = "订单标签")
     private String orderTag;
 
+    /** 订单时间范围 - 开始时间 */
+    @Transient
+    private Date beginTime;
+
+    /** 订单时间范围 - 结束时间 */
+    @Transient
+    private Date endTime;
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java
index 6ace054..ca703a1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java
@@ -391,7 +391,7 @@ public class InstructionServiceImpl implements IInstructionService {
                 address.append(phone);
                 System.out.println(address);
                 for (int i = 4; i < parts.length; i++) {
-                    address.append(parts[i]);
+                    address.append(parts[i]);F
                 }
                 String jf = productWithJF.get(modelNumber);
 
diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml
index 873dc1b..1c82ca3 100644
--- a/ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml
@@ -121,6 +121,8 @@
             <if test="itemId != null  and itemId != ''"> and item_id = #{itemId}</if>
             <if test="callerItemId != null  and callerItemId != ''"> and caller_item_id = #{callerItemId}</if>
             <if test="orderTag != null  and orderTag != ''"> and order_tag = #{orderTag}</if>
+            <if test="beginTime != null"> and order_time &gt;= #{beginTime}</if>
+            <if test="endTime != null"> and order_time &lt;= #{endTime}</if>
         </where>
         order by order_time desc
     </select>