From e1fecb89e0c848f58fa034c32537515dd8100a95 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 8 Nov 2024 14:15:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=90=8D=E7=A7=B0=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Response/AppointmentDetailResponse.cs           | 13 +------------
 .../Services/Implements/AppointmentService.cs       |  4 ++--
 .../Services/Implements/DeviceUploadLogService.cs   |  2 +-
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs b/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
index 2473187e..a3185d21 100644
--- a/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
+++ b/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
@@ -73,18 +73,7 @@ public class AppointmentDetailResponse
     /// <summary>
     /// 申请车间区域
     /// </summary>
-    public List<string> ApplyWorkplaceAreas
-    {
-        get
-        {
-            return ApplyWorkplaceAreasString.IsPresent()
-                ? ApplyWorkplaceAreasString.ToObject<List<string>>()
-                : new List<string>(0);
-        }
-    }
-
-    [JsonIgnore]
-    public string ApplyWorkplaceAreasString { get; set; }
+    public List<string> ApplyWorkplaceAreas { get; set; }
 
     /// <summary>
     /// 车间访问开始
diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
index 26d1fd17..f6062de7 100644
--- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
+++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
@@ -65,11 +65,11 @@ public class AppointmentService : IAppointmentService
                 Phone = x.Phone,
                 LicensePlate = x.LicensePlate,
                 IsEnterDoorArea = x.IsEnterDoorArea,
-                ApplyDoorArea = x.ApplyDoorArea,
+                ApplyDoorArea = SqlFunc.Subqueryable<AppointmentAreaEntity>().Where(p => p.CustomCode == x.ApplyDoorArea).Select(p => p.Name),
                 DoorStart = x.DoorStart,
                 DoorEnd = x.DoorEnd,
                 IsEnterWorkplace = x.IsEnterWorkplace,
-                ApplyWorkplaceAreasString = x.ApplyWorkplaceAreas.ToString(),
+                ApplyWorkplaceAreas = SqlFunc.Subqueryable<AppointmentAreaEntity>().Where(p => x.ApplyWorkplaceAreas.ToString().Contains(p.CustomCode)).ToList(p => p.Name),
                 WorkplaceStart = x.WorkplaceStart,
                 WorkplaceEnd = x.WorkplaceEnd,
                 ImageUrl = x.ImageUrl,
diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
index f756443d..ee020843 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
@@ -173,7 +173,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
             {
                 Id = x.Id,
                 OriginUserUniqueNo = x.UserUniqueNo,
-                OutsourceSupplier = device.Supplier,
+                OutsourceSupplier = os.Supplier,
                 SapUserCode = os.SapCode,
                 SapUserName = SqlFunc.Subqueryable<GainfoEntity>().Where(p => p.Code == os.SapCode).Select(p => p.Name),
                 DeviceUniqueNo = x.DeviceUniqueNo,