查询验证

2024-01-10 10:48:21 +08:00
parent 397ac4a154
commit 4c607302f3
13 changed files with 112 additions and 45 deletions
@@ -393,7 +393,11 @@ namespace IRaCIS.Core.Application.ViewModel

        public DateTime? EndAllocateDate { get; set; }

-        public Guid? RootReReadingTaskId { get; set; }
+		public DateTime? BeginSignTime { get; set; }
+
+		public DateTime? EndSignTime { get; set; }
+
+		public Guid? RootReReadingTaskId { get; set; }

        public string? TaskCode { get; set; }

@@ -758,7 +758,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
               .WhereIf(!string.IsNullOrEmpty(queryVisitTask.SubjectCode), t => (t.Subject.Code.Contains(queryVisitTask.SubjectCode) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(queryVisitTask.SubjectCode) && t.IsAnalysisCreate))
               .WhereIf(queryVisitTask.BeginAllocateDate != null, t => t.AllocateTime > queryVisitTask.BeginAllocateDate)
               .WhereIf(queryVisitTask.EndAllocateDate != null, t => t.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1))
-               .ProjectTo<ReadingTaskView>(_mapper.ConfigurationProvider);
+				  .WhereIf(queryVisitTask.BeginSignTime != null, t => t.SignTime > queryVisitTask.BeginSignTime)
+			   .WhereIf(queryVisitTask.EndSignTime != null, t => t.SignTime < queryVisitTask.EndSignTime!.Value.AddDays(1))
+			   .ProjectTo<ReadingTaskView>(_mapper.ConfigurationProvider);

            var defalutSortArray = new string[] { nameof(VisitTask.IsUrgent) + " desc", nameof(VisitTask.SubjectId), nameof(VisitTask.VisitTaskNum) };