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; } /// 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 /// /// 支出 /// - [Description("支出")] + [Description("消费")] Out = 0, /// 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 /// 连接信息 /// public string ConnectionInfo { get; set; } + + /// + /// 设备名称 + /// + 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);