From 4af590209f9a53cf3d49fbfdd068dcca8366da68 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 10 Oct 2024 12:27:37 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E8=AE=BF=E5=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/AppointmentAreaAssignmentEntity.cs | 3 +- .../Visitor/Entity/AppointmentAreaEntity.cs | 7 +-- .../Entity/VisitorAppointmentEntity.cs | 8 +-- .../Visitor/Enums/ApponintmentAreaEnumType.cs | 19 ------- .../Enums/VisitorAppointmentStatusEnumType.cs | 22 -------- .../Response/AppointmentDetailResponse.cs | 56 ------------------- .../Services/IAppointmentAreaService.cs | 13 ----- 7 files changed, 7 insertions(+), 121 deletions(-) delete mode 100644 Src/Dlhis.Entity/Visitor/Enums/ApponintmentAreaEnumType.cs delete mode 100644 Src/Dlhis.Entity/Visitor/Enums/VisitorAppointmentStatusEnumType.cs delete mode 100644 Src/Dlhis.Visitor/Appointment/Response/AppointmentDetailResponse.cs delete mode 100644 Src/Dlhis.Visitor/Appointment/Services/IAppointmentAreaService.cs diff --git a/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaAssignmentEntity.cs b/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaAssignmentEntity.cs index 02c0eead..82dc7a05 100644 --- a/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaAssignmentEntity.cs +++ b/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaAssignmentEntity.cs @@ -22,6 +22,7 @@ public class AppointmentAreaAssignmentEntity : SugarBaseEntity, ITenantId [SugarColumn(IsNullable = false, ColumnDescription = "设备code")] public Guid DeviceCode { get; set; } + [SugarColumn] public string TenantId { get; set; } -} +} \ No newline at end of file diff --git a/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaEntity.cs b/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaEntity.cs index c0f3d960..adb576aa 100644 --- a/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaEntity.cs +++ b/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaEntity.cs @@ -11,7 +11,7 @@ namespace Dlhis.Entity.Visitor.Entity; /// 预约区域 /// [SugarTable(TableName = "AppointmentArea", TableDescription = "预约区域")] -public class AppointmentAreaEntity : SugarBaseEntity, ITenantId, ISoftDeleted +public class AppointmentAreaEntity : SugarBaseEntity, ITenantId { /// /// 区域类型 @@ -48,7 +48,4 @@ public class AppointmentAreaEntity : SugarBaseEntity, ITenantId, ISoftDeleted [SugarColumn(IsNullable = false, ColumnDescription = " 基地/租户", UniqueGroupNameList = new[] { "idx_AppointmentArea_t_cc_tid" })] public string TenantId { get; set; } - - - public bool IsDeleted { get; set; } -} +} \ No newline at end of file diff --git a/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentEntity.cs b/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentEntity.cs index 9cc68b92..0718b525 100644 --- a/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentEntity.cs +++ b/Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentEntity.cs @@ -1,7 +1,5 @@ -using Dlhis.Entity.Visitor.Enums; -using Kurisu.AspNetCore.DataAccess.SqlSugar; +using Kurisu.AspNetCore.DataAccess.SqlSugar; using SqlSugar; -using SqlSugar.DbConvert; namespace Dlhis.Entity.Visitor.Entity; @@ -36,7 +34,7 @@ public class VisitorAppointmentEntity : SugarBaseEntity /// 申请时间 /// public DateTime Date { get; set; } - + /// /// 备注 /// @@ -51,4 +49,4 @@ public class VisitorAppointmentEntity : SugarBaseEntity /// 申请事由 /// public string Reason { get; set; } -} \ No newline at end of file +} diff --git a/Src/Dlhis.Entity/Visitor/Enums/ApponintmentAreaEnumType.cs b/Src/Dlhis.Entity/Visitor/Enums/ApponintmentAreaEnumType.cs deleted file mode 100644 index f7972f2e..00000000 --- a/Src/Dlhis.Entity/Visitor/Enums/ApponintmentAreaEnumType.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.ComponentModel; - -namespace Dlhis.Entity.Visitor.Enums; - -[Description("预约区域")] -public enum ApponintmentAreaEnumType -{ - /// - /// 门岗 - /// - [Description("门岗")] - Door = 1, - - /// - /// 车间 - /// - [Description("车间")] - Workshop = 2, -} diff --git a/Src/Dlhis.Entity/Visitor/Enums/VisitorAppointmentStatusEnumType.cs b/Src/Dlhis.Entity/Visitor/Enums/VisitorAppointmentStatusEnumType.cs deleted file mode 100644 index e8659094..00000000 --- a/Src/Dlhis.Entity/Visitor/Enums/VisitorAppointmentStatusEnumType.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.ComponentModel; - -namespace Dlhis.Entity.Visitor.Enums; - -/// -/// 访客预约明细状态 -/// -[Description("访客预约状态")] -public enum VisitorAppointmentStatusEnumType -{ - /// - /// 到达 - /// - [Description("到达")] - Valid = 1, - - /// - /// 作废 - /// - [Description("作废")] - Obsolete = 99 -} diff --git a/Src/Dlhis.Visitor/Appointment/Response/AppointmentDetailResponse.cs b/Src/Dlhis.Visitor/Appointment/Response/AppointmentDetailResponse.cs deleted file mode 100644 index 322e396b..00000000 --- a/Src/Dlhis.Visitor/Appointment/Response/AppointmentDetailResponse.cs +++ /dev/null @@ -1,56 +0,0 @@ -using Dlhis.Entity.Visitor.Enums; -using Kurisu.AspNetCore.Utils.Extensions; - -namespace Dlhis.Visitor.Appointment.Response; - -public class AppointmentDetailResponse -{ - public long Id { get; set; } - - public long AppointmentId { get; set; } - - /// - /// 流水号 - /// - public string FlowId { get; set; } - - /// - /// 访客名称 - /// - public string Name { get; set; } - - /// - /// 手机号 - /// - public string Phone { get; set; } - - /// - /// 身份证 - /// - public string IdNo { get; set; } - - /// - /// 预计到达 - /// - public DateTime Start { get; set; } - - /// - /// 预计离开 - /// - public DateTime End { get; set; } - - /// - /// 状态 - /// - public AppointmentDetailEnumType Status { get; set; } - - /// - /// 状态 - /// - public string StatusDesc => Status.GetDescription(); - - /// - /// 备注 - /// - public string Remark { get; set; } -} diff --git a/Src/Dlhis.Visitor/Appointment/Services/IAppointmentAreaService.cs b/Src/Dlhis.Visitor/Appointment/Services/IAppointmentAreaService.cs deleted file mode 100644 index 0a384e36..00000000 --- a/Src/Dlhis.Visitor/Appointment/Services/IAppointmentAreaService.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Dlhis.Visitor.Appointment.Request; -using Dlhis.Visitor.Appointment.Response; -using Kurisu.AspNetCore.DataAccess.Dto; - -namespace Dlhis.Visitor.Appointment.Services; - -public interface IAppointmentAreaService : IScopeDependency -{ - Task> GetPageAsync(PageDto request); - Task SaveAsync(AppointmentAreaSaveRequest request); - Task DeleteAsync(long id); - Task AssignAsync(AppointmentAreaAssignRequest request); -} \ No newline at end of file