IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -7,7 +7,6 @@
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.MassTransit.Consumer;
-using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using MassTransit.Mediator;
@@ -52,7 +51,7 @@ namespace IRaCIS.Core.Application.Services
         {
 
             var trialDocumentAttachmentQueryable = _trialDocumentAttachmentRepository
-                .WhereIf(inQuery.TrialDocumentId != null, x => x.TrialDocumentId == inQuery.TrialDocumentId)
+                .WhereIf(inQuery.TrialDocumentId!=null,x=>x.TrialDocumentId==inQuery.TrialDocumentId)
                   .WhereIf(inQuery.Name != null, x => x.Name.Contains(inQuery.Name))
                     .WhereIf(inQuery.FileFormat != null, x => x.FileFormat == inQuery.FileFormat)
                                         .ProjectTo<TrialDocumentAttachmentView>(_mapper.ConfigurationProvider);
@@ -133,7 +132,7 @@ namespace IRaCIS.Core.Application.Services
                 {
                     // 从新作用域解析服务
                     var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-                    await mediator.Publish(new TrialDocumentErverDayEvent { });
+                    await mediator.Publish(new TrialDocumentErverDayEvent {  });
                 }
             });
             return ResponseOutput.Result(true);
@@ -176,7 +175,7 @@ namespace IRaCIS.Core.Application.Services
                                         ResearchProgramNo = trialDoc.Trial.ResearchProgramNo,
                                         ExperimentName = trialDoc.Trial.ExperimentName,
                                         CurrentStaffTrainDays = trialDoc.CurrentStaffTrainDays,
-                                        NewStaffTrainDays = trialDoc.NewStaffTrainDays,
+                                        NewStaffTrainDays= trialDoc.NewStaffTrainDays,
                                         Id = trialDoc.Id,
                                         IsSystemDoc = false,
                                         CreateTime = trialDoc.CreateTime,
@@ -510,7 +509,7 @@ namespace IRaCIS.Core.Application.Services
                 .WhereIf(inQuery.IsSign == true, t => t.ConfirmTime != null)
                 .WhereIf(inQuery.IsSign == false, t => t.ConfirmTime == null);
 
-            var defalutSortArray = new string[] { nameof(UnionDocumentWithConfirmInfoView.IsDeleted), nameof(UnionDocumentWithConfirmInfoView.CreateTime) + " desc", nameof(UnionDocumentWithConfirmInfoView.ConfirmTime) };
+
 
             var result = await unionQuery.ToPagedListAsync(inQuery);
 
@@ -914,7 +913,7 @@ namespace IRaCIS.Core.Application.Services
             var systemDocQuery =
                from sysDoc in _systemDocumentRepository.AsQueryable(false)
                                               .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)
-               from identityUser in _identityUserRepository.AsQueryable(false).Where(t => t.Status == UserStateEnum.Enable && t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+               from identityUser in _identityUserRepository.AsQueryable(false).Where(t =>t.Status== UserStateEnum.Enable && t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
                   .Where(t => inQuery.UserId != null ? t.Id == inQuery.UserId : true)
                   .Where(t => inQuery.UserTypeId != null ? t.UserRoleList.Any(t => t.UserTypeId == inQuery.UserTypeId && t.IsUserRoleDisabled == false) : true)
                join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = identityUser.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc