From 3b4b8379943e8b3809b7c9d5c8e111ce4bf590be Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Mon, 11 Mar 2024 10:31:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=87=91=E9=A2=9D=E5=8F=98=E6=AD=A3?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Services/Implements/BalanceService.cs           | 8 ++++++++
 .../Canteen/Enums/BalanceRecordTypeEnumType.cs            | 2 +-
 .../Response/DeviceTaskAssignmentResponse.cs              | 5 +++++
 .../Services/Implements/DeviceTaskAssignmentService.cs    | 3 ++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 9acab61d..9dd25f9d 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -79,6 +79,10 @@ public class BalanceService : IBalanceService
                     TenantId = record.TenantId,
                 })
                 .ToPageListAsync(request);
+        page.Data.ForEach(item =>
+        {
+            item.Amount = Math.Abs(item.Amount);
+        });
 
         try
         {
@@ -224,6 +228,10 @@ public class BalanceService : IBalanceService
             })
             .ToPageListAsync(request);
 
+        foreach (var item in paeginfo.Data)
+        {
+            item.Amount = Math.Abs(item.Amount);
+        }
         return paeginfo;
     }
     /// <summary>
diff --git a/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordTypeEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordTypeEnumType.cs
index ccc77726..da335720 100644
--- a/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordTypeEnumType.cs
+++ b/Src/Dlhis.Entity/Canteen/Enums/BalanceRecordTypeEnumType.cs
@@ -11,7 +11,7 @@ public enum BalanceRecordTypeEnumType
     /// <summary>
     /// 支出
     /// </summary>
-    [Description("支出")]
+    [Description("消费")]
     Out = 0,
 
     /// <summary>
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs
index beeb82ed..fc9e74d2 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs
@@ -88,4 +88,9 @@ public class DeviceTaskAssignmentResponse
     /// 连接信息
     /// </summary>
     public string ConnectionInfo { get; set; }
+
+    /// <summary>
+    /// 设备名称
+    /// </summary>
+    public string DeviceName { get; set; }
 }
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
index 2b8d28f8..0138667d 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
@@ -54,7 +54,8 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
                 LastUpdateTime = deviceTask.ModifiedTime,
                 TenantId = deviceTask.TenantId,
                 DeployPlace = device.DeployPlace,
-                ConnectionInfo = device.ConnectionInfo
+                ConnectionInfo = device.ConnectionInfo,
+                DeviceName = device.Supplier
             })
             .ToPageListAsync(request);