From 21bd8300027f9a100b68ffa6080178fb70eb0e25 Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Wed, 31 Jan 2024 11:02:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=9E=9A=E4=B8=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FileOperation/Response/ApkFileResponse.cs          | 10 +++++-----
 Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs          |  3 ++-
 Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs  |  3 ++-
 .../TaskAssignment/Request/TaskRecordsRequest.cs       |  6 +++---
 .../Services/Implements/DeviceTaskAssignmentService.cs |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

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
         /// </summary>
         public string Name { get; set; }
 
-        /// <summary>
-        /// 地址
-        /// </summary>
-        public string Url { get; set; }
-
         /// <summary>
         /// 版本号
         /// </summary>
         public int VersionCode { get; set; }
 
+        /// <summary>
+        /// 版本名称
+        /// </summary>
+        public int VersionName { get; set; }
+
         /// <summary>
         /// 修改信息
         /// </summary>
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
     /// <summary>
     /// 设备机功能类型
     /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(150)",  ColumnDescription = "设备机功能类型")]
+    [SugarColumn(ColumnDescription = "设备机功能类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
     public DeviceGroupFunctionEnumType Type { get; set; }
 
     /// <summary>
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
     /// <summary>
     /// 设备组功能类型
     /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(150)", ColumnDescription = "设备组功能类型")]
+    [SugarColumn(ColumnDescription = "设备组功能类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
     public DeviceGroupFunctionEnumType Type { get; set; }
 
     /// <summary>
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; }
 
         /// <summary>
-        /// 设备功能
+        /// 设备机功能类型
         /// </summary>
         [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<DeviceEntity>()
-            .Where(x => x.Funcs.Contains(request.type))
+            .Where(x => x.Type == request.type)
             .Select(x => x.UniqueNo)
             .ToListAsync();
         devices.ThrowIfNull($"{request.type.GetDescription}功能机器为空");