fix 金额变正新增设备名称
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -11,7 +11,7 @@ public enum BalanceRecordTypeEnumType
|
||||
/// <summary>
|
||||
/// 支出
|
||||
/// </summary>
|
||||
[Description("支出")]
|
||||
[Description("消费")]
|
||||
Out = 0,
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -88,4 +88,9 @@ public class DeviceTaskAssignmentResponse
|
||||
/// 连接信息
|
||||
/// </summary>
|
||||
public string ConnectionInfo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 设备名称
|
||||
/// </summary>
|
||||
public string DeviceName { get; set; }
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user