修改查询

2025-03-10 14:17:22 +08:00
parent 4cdfb60fdf
commit e5fa3a09b3
4 changed files with 51 additions and 3 deletions
@@ -178,7 +178,25 @@ namespace IRaCIS.Core.Application.Contracts

        public bool? IsConfirmed { get; set; }

+        /// <summary>
+        /// 课时状态
+        /// </summary>
        public bool? IsDeleted { get; set; }
+
+        /// <summary>
+        /// 用户名
+        /// </summary>
+        public string? UserName { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime? StartCreateTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime? EndCreateTime { get; set; }
    }

    ///<summary> SystemDocumentAddOrEdit  列表查询参数模型</summary>
@@ -473,7 +473,7 @@ namespace IRaCIS.Core.Application.Services
            var trialDocQuery =
                  from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(t => t.TrialId == inQuery.TrialId)
                                  .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)
-                  from trialUser in _trialIdentityUserRepository.AsQueryable(false).Where(t => t.TrialId == inQuery.TrialId
+                                      from trialUser in _trialIdentityUserRepository.AsQueryable(false).Where(t => t.TrialId == inQuery.TrialId
                                && t.TrialUserRoleList.AsQueryable().Any(t => trialDoc.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == t.UserRole.UserTypeId))
                                )
                                 .Where(t => inQuery.UserId != null ? t.IdentityUserId == inQuery.UserId : true)
@@ -557,6 +557,9 @@ namespace IRaCIS.Core.Application.Services
                .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
                .WhereIf(inQuery.IsConfirmed == true, t => t.ConfirmTime != null)
                .WhereIf(inQuery.IsConfirmed == false, t => t.ConfirmTime == null)
+                  .WhereIf(inQuery.StartCreateTime!=null, t => t.CreateTime >= inQuery.StartCreateTime.Value)
+                   .WhereIf(inQuery.EndCreateTime != null, t => t.CreateTime <= inQuery.EndCreateTime.Value)
+                .WhereIf(!string.IsNullOrEmpty(inQuery.UserName), t => t.UserName.Contains(inQuery.UserName))
                .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted);

            var result = await unionQuery.ToPagedListAsync(inQuery);