From d44d34d20bf71d8b9736608a691189aa844ec11d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 九月 2024 14:17:03 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java
index 10e711c..c4f9676 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java
@@ -1,7 +1,6 @@
 package com.ruoyi.order.api.model;
 
 import com.ruoyi.common.core.web.page.BasePage;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,14 +8,37 @@
 import java.util.List;
 
 @Data
-@ApiModel(value = "充电账单列表查询参数")
 public class ChargingListQuery extends BasePage {
-    @ApiModelProperty("订单分类 1全站 2各个站点")
-    private String type;
-    @ApiModelProperty("账单周期2020-01-01 00:00:00 - 2020-01-01 23:59:59")
-    private String startTime;
-    @ApiModelProperty("1已出账 2未出账")
+    @ApiModelProperty("订单编号")
+    private String code;
+
+    @ApiModelProperty("电站id")
+    private Integer siteId;
+    @ApiModelProperty("状态(0=未知,1=等待中,2=启动中,3=充电中,4=停止中,5=已结束)")
+    private Integer status;
+    @ApiModelProperty("订单分类(1全站 2各个站点)")
+    private Integer type;
+    @ApiModelProperty("状态(1未出账 2已出账)")
     private Integer state;
     @ApiModelProperty("uid 前端忽略")
     private String uid;
+
+    @ApiModelProperty("手机号")
+    private String phone;
+    @ApiModelProperty("车牌号")
+    private String licensePlate;
+
+    @ApiModelProperty("订单类型(1=充电订单(小程序),2=充电订单(刷卡))")
+    private Integer orderType;
+
+    @ApiModelProperty("开始时间 2020-01-01 12:00:00 - 2020-01-01 23:00:00")
+    private String startTime;
+
+    @ApiModelProperty("结束时间 2020-01-01 12:00:00 - 2020-01-01 23:00:00")
+    private String endTime;
+    @ApiModelProperty("用户ids 前端忽略")
+    private List<Long> userIds;
+    @ApiModelProperty("车辆ids 前端忽略")
+    private List<Long> carIds;
+
 }

--
Gitblit v1.7.1