diff --git a/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs b/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
index eb3f1b70..43240e8f 100644
--- a/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
+++ b/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
@@ -1,13 +1,14 @@
using Dlhis.Entity.Visitor.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
namespace Dlhis.Basic.Appointment.Response;
public class AppointmentDetailResponse
{
public long Id { get; set; }
-
+
public AppointmentPageResponse Mst { get; set; }
-
+
///
/// 流水号
///
@@ -56,12 +57,12 @@ public class AppointmentDetailResponse
///
/// 访客开始
///
- public DateTime DoorStart { get; set; }
+ public DateTime? DoorStart { get; set; }
///
/// 访问结束
///
- public DateTime DoorEnd { get; set; }
+ public DateTime? DoorEnd { get; set; }
///
/// 是否进入车间
@@ -71,7 +72,18 @@ public class AppointmentDetailResponse
///
/// 申请车间区域
///
- public List ApplyWorkplaceAreas { get; set; }
+ public List ApplyWorkplaceAreas
+ {
+ get
+ {
+ return ApplyWorkplaceAreasString.IsPresent()
+ ? ApplyWorkplaceAreasString.ToObject>()
+ : new List(0);
+ }
+ }
+
+
+ public string ApplyWorkplaceAreasString { get; set; }
///
/// 车间访问开始
diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
index c9a0df5c..2617df28 100644
--- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
+++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
@@ -54,7 +54,29 @@ public class AppointmentService : IAppointmentService
{
return await _dbContext.Queryable()
.Where(x => x.No == no)
- .Select()
+ .Select(x => new AppointmentDetailResponse
+ {
+ Id = x.Id,
+ No = x.No,
+ UserNo = x.UserNo,
+ IdType = x.IdType,
+ IdNo = x.IdNo,
+ Name = x.Name,
+ Phone = x.Phone,
+ LicensePlate = x.LicensePlate,
+ IsEnterDoorArea = x.IsEnterDoorArea,
+ ApplyDoorArea = x.ApplyDoorArea,
+ DoorStart = x.DoorStart,
+ DoorEnd = x.DoorEnd,
+ IsEnterWorkplace = false,
+ ApplyWorkplaceAreasString = x.ApplyWorkplaceAreas.ToString(),
+ WorkplaceStart = x.WorkplaceStart,
+ WorkplaceEnd = x.WorkplaceEnd,
+ ImageUrl = x.ImageUrl,
+ Remark = x.Remark,
+ DoorStatus = x.DoorStatus,
+ WorkplaceStatus = VisitorAppointmentDetailStatusEnumType.Wait
+ })
.ToListAsync();
}