From 1bddd5c90f52d381065c3ef24260f4a11defa2c9 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 15 Mar 2024 11:59:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E6=A0=B9=E8=8A=82=E7=82=B9pno?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Organization/Services/Implements/DepartmentService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs index fd4f8e74..a7cfd72d 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs @@ -35,7 +35,7 @@ public class DepartmentService : IDepartmentService { Name = x.Name, No = x.Code, - PNo = x.PCode, + PNo = null, Tenant = x.Code, _Next = tops.Select(item => { From 8a0eb06038056dad9f2eefbc5376d25b33313ee2 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 15 Mar 2024 12:15:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Request/DeviceTaskAssignmentRequest.cs | 7 ++----- .../Implements/DeviceTaskAssignmentService.cs | 12 ++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs index d6c88730..ed69bfdb 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs @@ -12,16 +12,13 @@ public class DeviceTaskAssignmentRequest : PageDto [EnumDataType(typeof(DeviceTypeEnumType))] public DeviceTypeEnumType? Type { get; set; } - /// /// 任务类型 /// - [EnumDataType(typeof(DeviceTaskEnumType))] - public DeviceTaskEnumType? TaskType { get; set; } + public List TaskTypes { get; set; } /// /// 任务下发状态 DeviceTaskStatusEnumType /// - [EnumDataType(typeof(DeviceTaskStatusEnumType))] - public DeviceTaskStatusEnumType? Status { get; set; } + public List Status { get; set; } } diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs index 50755267..cec44059 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs @@ -28,15 +28,15 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService var page = await _dbContext.Queryable() .LeftJoin((deviceTask, ga) => deviceTask.UserNo == ga.No) .LeftJoin((deviceTask, ga, device) => deviceTask.DeviceUniqueNo == device.UniqueNo) - .WhereIF(!request.Search.IsEmpty(), (deviceTask, ga, device) => - deviceTask.UserNo == request.Search - || ga.Name.Contains(request.Search) - || ga.Code == request.Search + .WhereIF(!request.Search.IsEmpty(), (deviceTask, ga, device) => + deviceTask.UserNo == request.Search + || ga.Name.Contains(request.Search) + || ga.Code == request.Search || deviceTask.DeviceUniqueNo == request.Search ) - .WhereIF(request.TaskType.HasValue, deviceTask => deviceTask.Type == request.TaskType) + .WhereIF(request.TaskTypes.IsPresent(), deviceTask => request.TaskTypes.Contains(deviceTask.Type)) .WhereIF(request.Type.HasValue, (deviceTask, ga, device) => device.Type == request.Type) - .WhereIF(request.Status.HasValue, deviceTask => deviceTask.Status == request.Status) + .WhereIF(request.Status.IsPresent(), deviceTask => request.Status.Contains(deviceTask.Status)) .Where(deviceTask => 1 == 1) .OrderBy(deviceTask => deviceTask.CreateTime, OrderByType.Desc) .Select((deviceTask, ga, device) => new DeviceTaskAssignmentResponse