From 9b87e5b6cc388a1e38c601a5d752dfe33109498e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 25 六月 2025 17:25:41 +0800
Subject: [PATCH] 大屏接口bug修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java
index a6275c3..ed4c78f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java
@@ -2,9 +2,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.util.List;
+import lombok.Data;
/**
* @author HJL
@@ -24,6 +23,7 @@
@ApiModelProperty("品类")
private Integer classNameId;
+ private Integer serveId;
@ApiModelProperty("预约姓名")
private String reservationName;
@@ -31,7 +31,7 @@
@ApiModelProperty("预约手机号")
private String reservationPhone;
- @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派)")
+ @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派，7：待预约)")
private Integer state;
@ApiModelProperty("师傅名称")
@@ -54,6 +54,7 @@
@ApiModelProperty("站点名称")
private String serveName;
+ private String address;
@ApiModelProperty(value = "页码", required = true)
private Integer pageNum = 1;
@@ -61,6 +62,7 @@
@ApiModelProperty(value = "订单类型0:正常订单,1:后台订单")
private Integer type ;
+ private Integer fake ;
@ApiModelProperty(value = "每页显示条数", required = true)
private Integer pageSize = 10;
@@ -73,4 +75,14 @@
@ApiModelProperty("服务ids")
private List<Integer> servIds ;
+ @ApiModelProperty("订单完成开始时间")
+ private String completeTimeStart;
+
+ @ApiModelProperty("订单完成结束时间")
+ private String completeTimeEnd;
+ private String[] siteIds;
+
+ @ApiModelProperty(value = "完工时间排序 1=升序 2=降序")
+ private Integer completeType ;
+
}
--
Gitblit v1.7.1