diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs index e114ea36..0cbaa8ef 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs @@ -5,7 +5,6 @@ using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop; using Kurisu.Core.DataAccess.Dto; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Org.BouncyCastle.Asn1.Ocsp; namespace Dlhis.Canteen.Order.Controllers; diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordSummaryRespones.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordSummaryRespones.cs index 4be9a731..f6208b72 100644 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordSummaryRespones.cs +++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordSummaryRespones.cs @@ -9,6 +9,11 @@ namespace Dlhis.Canteen.Order.Response /// public string DepartmentNo { get; set; } + /// + /// 部门名称 + /// + public string DepartmentName { get; set; } + /// /// 成本中心 /// diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 49d202aa..61d48341 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -298,6 +298,12 @@ public class BalanceService : IBalanceService lst.Add(obj); } + var departments = await _dbContext.Queryable().ToListAsync(); + lst.ForEach(x => + { + x.DepartmentName = departments.Where(d => d.No == x.DepartmentNo).Select(d => d.Name).First(); + }); + // 分页操作 var startIndex = (request.PageIndex - 1) * request.PageSize; var pagedData = lst.Skip(startIndex).Take(request.PageSize).ToList(); diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs index de4a7a64..9e3d0dff 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs @@ -16,6 +16,11 @@ public class DeviceUploadLogResponse /// public string Supplier { get; set; } + /// + /// 设备部署点 + /// + public string DeployPlace { get; set; } + /// /// 用户档案号 /// diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index ce149e14..12ec6deb 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -46,6 +46,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService UserNo = ga.No, UserCode = ga.Code, UserName = ga.Name, + DeployPlace = device.DeployPlace }) .ToPageListAsync(request);