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 @@
and item_id = #{itemId}
and caller_item_id = #{callerItemId}
and order_tag = #{orderTag}
+ and order_time >= #{beginTime}
+ and order_time <= #{endTime}
order by order_time desc