diff --git a/Src/Dlhis.Common/FileOperation/Response/ApkFileResponse.cs b/Src/Dlhis.Common/FileOperation/Response/ApkFileResponse.cs index 6f26307e..886ca16a 100644 --- a/Src/Dlhis.Common/FileOperation/Response/ApkFileResponse.cs +++ b/Src/Dlhis.Common/FileOperation/Response/ApkFileResponse.cs @@ -9,16 +9,16 @@ namespace Dlhis.Common.FileOperation.Response /// public string Name { get; set; } - /// - /// 地址 - /// - public string Url { get; set; } - /// /// 版本号 /// public int VersionCode { get; set; } + /// + /// 版本名称 + /// + public int VersionName { get; set; } + /// /// 修改信息 /// diff --git a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs index b577bcb2..c6bd3218 100644 --- a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs @@ -2,6 +2,7 @@ using Kurisu.Core.DataAccess.Entity; using Kurisu.SqlSugar; using SqlSugar; +using SqlSugar.DbConvert; namespace Dlhis.Entity.Basic.Entity; @@ -44,7 +45,7 @@ public class DeviceEntity : SugarBaseEntity, ITenantId /// /// 设备机功能类型 /// - [SugarColumn(ColumnDataType = "varchar(150)", ColumnDescription = "设备机功能类型")] + [SugarColumn(ColumnDescription = "设备机功能类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))] public DeviceGroupFunctionEnumType Type { get; set; } /// diff --git a/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs b/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs index 3008f9cd..8fdce64f 100644 --- a/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs +++ b/Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs @@ -2,6 +2,7 @@ using Kurisu.Core.DataAccess.Entity; using Kurisu.SqlSugar; using SqlSugar; +using SqlSugar.DbConvert; namespace Dlhis.Entity.Device.Entities; @@ -15,7 +16,7 @@ public class DeviceGroupEntity : SugarBaseEntity, ITenantId, ISoftDeleted /// /// 设备组功能类型 /// - [SugarColumn(ColumnDataType = "varchar(150)", ColumnDescription = "设备组功能类型")] + [SugarColumn(ColumnDescription = "设备组功能类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))] public DeviceGroupFunctionEnumType Type { get; set; } /// diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/TaskRecordsRequest.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/TaskRecordsRequest.cs index 66176c99..13d9eed0 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/TaskRecordsRequest.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/TaskRecordsRequest.cs @@ -15,10 +15,10 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Request public string GainfoNo { get; set; } /// - /// 设备功能 + /// 设备机功能类型 /// [Required] - [EnumDataType(typeof(DeviceFuncEnumType))] - public DeviceFuncEnumType type { get; set; } + [EnumDataType(typeof(DeviceGroupFunctionEnumType))] + public DeviceGroupFunctionEnumType type { get; set; } } } diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs index ae27702e..c1bf0b8c 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs @@ -51,7 +51,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService { //获取启用的功能设备 var devices = await _dbContext.Queryable() - .Where(x => x.Funcs.Contains(request.type)) + .Where(x => x.Type == request.type) .Select(x => x.UniqueNo) .ToListAsync(); devices.ThrowIfNull($"{request.type.GetDescription}功能机器为空");