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 f90a43d..64eaaff 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,12 +229,4 @@ 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/resources/mapper/jarvis/OrderRowsMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml index 1c82ca3..b4995bf 100644 --- a/ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml @@ -121,8 +121,8 @@ and item_id = #{itemId} and caller_item_id = #{callerItemId} and order_tag = #{orderTag} - and order_time >= #{beginTime} - and order_time <= #{endTime} + and order_time >= #{params.beginTime} + and order_time <= #{params.endTime} order by order_time desc