From ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 04 九月 2024 09:17:55 +0800
Subject: [PATCH] 新增优化

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderQueryRequest.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderQueryRequest.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderQueryRequest.java
index 2ea4174..0686171 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderQueryRequest.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderQueryRequest.java
@@ -4,7 +4,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
+import java.util.List;
 
 /**
  * @author HJL
@@ -27,7 +27,7 @@
     @ApiModelProperty("预约手机号")
     private String reservationPhone;
 
-    @ApiModelProperty("订单状态((0:待派单;1:待接单;2:待上门;3:待完工;4:已完结;5:已取消))")
+    @ApiModelProperty("订单状态(0:待派单;1:待上门;2:待完工;3:已完结;4:已取消;5:已改派)")
     private Integer state;
 
     @ApiModelProperty("师傅名称")
@@ -36,19 +36,28 @@
     @ApiModelProperty("师傅电话")
     private String workerPhone;
 
-    @ApiModelProperty("下单时间")
-    private Date orderTime;
+    @ApiModelProperty("下单开始时间")
+    private String orderTimeStart;
 
-    @ApiModelProperty("预约上门时间")
-    private Date time;
+    @ApiModelProperty("下单结束时间")
+    private String orderTimeEnd;
+
+    @ApiModelProperty("预约上门开始时间")
+    private String startTime;
+
+    @ApiModelProperty("预约上门结束时间")
+    private String endTime;
 
     @ApiModelProperty("站点名称")
     private String serveName;
 
     @ApiModelProperty(value = "页码", required = true)
-    private Integer pageNum;
+    private Integer pageNum = 1;
 
     @ApiModelProperty(value = "每页显示条数", required = true)
-    private Integer pageSize;
+    private Integer pageSize = 10;
+
+    @ApiModelProperty("导出ids集合")
+    private List<String> ids;
 
 }

--
Gitblit v1.7.1