From dcff8ae4cd446921c85cc956a7e27bb715c3c582 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 11:39:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 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..842cad4 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
@@ -9,14 +9,40 @@
import java.util.List;
@Data
-@ApiModel(value = "充电账单列表查询参数")
+@ApiModel("充电时段统计DTO")
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("状态（1日结 2月结）")
+ private Integer orderState;
@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