From 15f89a82a294a9c453598c6b0f17929794ac0f49 Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Tue, 12 Mar 2024 09:24:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs   | 1 -
 .../Order/Response/BalanceRecordSummaryRespones.cs          | 5 +++++
 .../Order/Services/Implements/BalanceService.cs             | 6 ++++++
 .../DeviceUploadLog/Response/DeviceUploadLogResponse.cs     | 5 +++++
 .../Services/Implements/DeviceUploadLogService.cs           | 1 +
 5 files changed, 17 insertions(+), 1 deletion(-)

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
         /// </summary>
         public string DepartmentNo { get; set; }
 
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DepartmentName { get; set; }
+
         /// <summary>
         /// 成本中心
         /// </summary>
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<DepartmentEntity>().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
     /// </summary>
     public string Supplier { get; set; }
 
+    /// <summary>
+    /// 设备部署点
+    /// </summary>
+    public string DeployPlace { get; set; }
+
     /// <summary>
     /// 用户档案号
     /// </summary>
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);