From e4946d7351efa77fb07eded5e6bbcd1873b42b64 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 11 Oct 2024 15:12:35 +0800
Subject: [PATCH] fix AsAppointment

---
 .../Appointment/Controllers/AppointmentsController.cs      | 6 +++---
 .../Appointment/Response/AppointmentDetailResponse.cs      | 6 +++++-
 .../Appointment/Services/Implements/AppointmentService.cs  | 7 +++++--
 Src/Dlhis.Basic/Device/Response/DeviceGroupTreeResponse.cs | 7 ++++++-
 .../Organization/Services/Implements/GainfoGroupService.cs | 2 +-
 .../Visitor/Entity/VisitorAppointmentDetailEntity.cs       | 6 ++++--
 6 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Src/Dlhis.Basic/Appointment/Controllers/AppointmentsController.cs b/Src/Dlhis.Basic/Appointment/Controllers/AppointmentsController.cs
index 11b988ef..28b36138 100644
--- a/Src/Dlhis.Basic/Appointment/Controllers/AppointmentsController.cs
+++ b/Src/Dlhis.Basic/Appointment/Controllers/AppointmentsController.cs
@@ -40,8 +40,10 @@ public class AppointmentsController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
+    [AllowAnonymous]
     [HttpPost("confirm")]
     [Transactional]
+    [IgnoreTenant]
     public async Task ConfirmAsync(AppointmentConfirmRequest request)
     {
         await _appointmentService.ConfirmAsync(request);
@@ -54,9 +56,7 @@ public class AppointmentsController : ControllerBase
     /// <returns></returns>
     [AllowAnonymous]
     [HttpGet("today")]
-    public async Task<AppointmentDetailResponse> GetTodayByIdNoAsync(
-        [FromQuery] [StringLength(18, MinimumLength = 18, ErrorMessage = "身份证有误")] [Required(ErrorMessage = "身份证有误")]
-        string idNo)
+    public async Task<AppointmentDetailResponse> GetTodayByIdNoAsync(string idNo)
     {
         return await _appointmentService.GetTodayByIdNoAsync(idNo);
     }
diff --git a/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs b/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
index 9a0cd25c..eb3f1b70 100644
--- a/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
+++ b/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
@@ -4,7 +4,11 @@ namespace Dlhis.Basic.Appointment.Response;
 
 public class AppointmentDetailResponse
 {
-   /// <summary>
+    public long Id { get; set; }
+    
+    public AppointmentPageResponse Mst { get; set; }
+    
+    /// <summary>
     /// 流水号
     /// </summary>
     public string No { get; set; }
diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
index dc33b6a2..120f5bd8 100644
--- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
+++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
@@ -110,7 +110,7 @@ public class AppointmentService : IAppointmentService
         }
         catch (Exception)
         {
-            throw new UserFriendlyException("凭证有误");
+            //ignore
         }
 
         var now = DateTime.Now;
@@ -118,7 +118,10 @@ public class AppointmentService : IAppointmentService
             .LeftJoin<GainfoEntity>((x, ga) => ga.IdNo == idNo)
             .Where((x, ga) => ga.IdNo == idNo)
             .Where(x => (x.IsEnterDoorArea && SqlFunc.DateIsSame(x.DoorStart, now)) || (x.IsEnterWorkplace && SqlFunc.DateIsSame(x.WorkplaceStart, now)))
-            .Select<AppointmentDetailResponse>()
+            .Select(x => new AppointmentDetailResponse
+            {
+                Mst = SqlFunc.Subqueryable<VisitorAppointmentDetailEntity>().Where(p => p.No == x.No).First<AppointmentPageResponse>()
+            }, true)
             .SingleAsync();
     }
 
diff --git a/Src/Dlhis.Basic/Device/Response/DeviceGroupTreeResponse.cs b/Src/Dlhis.Basic/Device/Response/DeviceGroupTreeResponse.cs
index b1b919d9..95ad5f56 100644
--- a/Src/Dlhis.Basic/Device/Response/DeviceGroupTreeResponse.cs
+++ b/Src/Dlhis.Basic/Device/Response/DeviceGroupTreeResponse.cs
@@ -60,8 +60,13 @@ public class DeviceGroupTreeResponse
     [JsonIgnore]
     public string TenantId { get; set; }
 
+    /// <summary>
+    /// 是否作为方可预约组
+    /// </summary>
+    public bool AsAppointment { get; set; }
+
     /// <summary>
     /// 下级
     /// </summary>
     public List<DeviceGroupTreeResponse> Next { get; set; } = new();
-}
+}
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
index d4291220..237f7ceb 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
@@ -94,7 +94,7 @@ public class GainfoGroupService : IGainfoGroupService
                 .Select(x => x.No)
                 .ToListAsync();
 
-            (userNos.Count != request.UserNos.Count).ThrowIfTrue("存在权限外人员,无法添加");
+            //(userNos.Count != request.UserNos.Count).ThrowIfTrue("存在权限外人员,无法添加");
 
             var entities = userNos.Select(x => new GainfoGroupRelationshipEntity
             {
diff --git a/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentDetailEntity.cs b/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentDetailEntity.cs
index c7b01aaa..ff797d36 100644
--- a/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentDetailEntity.cs
+++ b/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentDetailEntity.cs
@@ -64,12 +64,14 @@ public class VisitorAppointmentDetailEntity : SugarBaseEntity
     /// <summary>
     /// 访客开始
     /// </summary>
-    public DateTime DoorStart { get; set; }
+    [SugarColumn(IsNullable = true)]
+    public DateTime? DoorStart { get; set; }
 
     /// <summary>
     /// 访问结束
     /// </summary>
-    public DateTime DoorEnd { get; set; }
+    [SugarColumn(IsNullable = true)]
+    public DateTime? DoorEnd { get; set; }
 
     /// <summary>
     /// 是否进入车间