From 1e48495e417aee8938dc176e2e7c6578cd7a0349 Mon Sep 17 00:00:00 2001
From: xjl <2595686544@qq.com>
Date: Thu, 23 May 2024 18:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E7=94=B5=E8=AE=A2=E5=8D=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Entity/Api/Req/AddChargeOrderReq.cs    | 4 ++--
 Entity/Api/Req/ModifyChargeOrderReq.cs | 2 +-
 Entity/Api/Req/QueryChargeOrderReq.cs  | 2 +-
 Entity/Api/Resp/ChargeOrderResp.cs     | 2 +-
 Service/Station/ChargeOrderService.cs  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Entity/Api/Req/AddChargeOrderReq.cs b/Entity/Api/Req/AddChargeOrderReq.cs
index f36349f..9883143 100644
--- a/Entity/Api/Req/AddChargeOrderReq.cs
+++ b/Entity/Api/Req/AddChargeOrderReq.cs
@@ -75,14 +75,14 @@ public partial class AddChargeOrderReq
     /// Default:
     /// Nullable:True
     /// </summary>
-    public int? StopSoc { get; set; }
+    public int StopSoc { get; set; }
 
     /// <summary>
     /// Desc:充电时长
     /// Default:
     /// Nullable:True
     /// </summary>
-    public string ?ChargeTimeCount { get; set; }
+    public int ChargeTimeCount { get; set; }
 
     /// <summary>
     /// Desc:充电电量
diff --git a/Entity/Api/Req/ModifyChargeOrderReq.cs b/Entity/Api/Req/ModifyChargeOrderReq.cs
index 3ae4c04..0e4bb90 100644
--- a/Entity/Api/Req/ModifyChargeOrderReq.cs
+++ b/Entity/Api/Req/ModifyChargeOrderReq.cs
@@ -94,7 +94,7 @@ namespace Entity.Api.Req
         /// Default:
         /// Nullable:True
         /// </summary>
-        public string? ChargeTimeCount { get; set; }
+        public int? ChargeTimeCount { get; set; }
 
         /// <summary>
         /// Desc:充电电量
diff --git a/Entity/Api/Req/QueryChargeOrderReq.cs b/Entity/Api/Req/QueryChargeOrderReq.cs
index f42988e..7fbc2cd 100644
--- a/Entity/Api/Req/QueryChargeOrderReq.cs
+++ b/Entity/Api/Req/QueryChargeOrderReq.cs
@@ -81,7 +81,7 @@ namespace Entity.Api.Req
         /// Default:
         /// Nullable:True
         /// </summary>
-        public string? ChargeTimeCount { get; set; }
+        public int? ChargeTimeCount { get; set; }
 
 
         /// <summary>
diff --git a/Entity/Api/Resp/ChargeOrderResp.cs b/Entity/Api/Resp/ChargeOrderResp.cs
index 74e6e67..c424ee0 100644
--- a/Entity/Api/Resp/ChargeOrderResp.cs
+++ b/Entity/Api/Resp/ChargeOrderResp.cs
@@ -93,7 +93,7 @@ namespace Entity.Api.Resp
         /// Default:
         /// Nullable:True
         /// </summary>
-        public string ChargeTimeCount { get; set; }
+        public int ChargeTimeCount { get; set; }
 
         /// <summary>
         /// Desc:充电电量
diff --git a/Service/Station/ChargeOrderService.cs b/Service/Station/ChargeOrderService.cs
index 837ff86..cbe0217 100644
--- a/Service/Station/ChargeOrderService.cs
+++ b/Service/Station/ChargeOrderService.cs
@@ -86,7 +86,7 @@ public class ChargeOrderService : BaseServices<ChargeOrder>
             Expression<Func<ChargeOrder, bool>> condition2Expr = u => u.EndTime == chargeOrder.EndTime;
             where = where == null ? condition2Expr : Expression.Lambda<Func<ChargeOrder, bool>>(Expression.AndAlso(where.Body, condition2Expr.Body), parameter);
         }
-        if (!string.IsNullOrEmpty(chargeOrder.ChargeTimeCount))
+        if (chargeOrder.ChargeTimeCount!=0)
         {
             Expression<Func<ChargeOrder, bool>> condition2Expr = u => u.ChargeTimeCount == chargeOrder.ChargeTimeCount;
             where = where == null ? condition2Expr : Expression.Lambda<Func<ChargeOrder, bool>>(Expression.AndAlso(where.Body, condition2Expr.Body), parameter);