From fcdee39356b5238512867e046c0c66aa15e0aed6 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 6 Aug 2025 10:56:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Document/TrialDocumentService.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index 745d6993e..9757397cb 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -7,6 +7,7 @@ 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; @@ -51,7 +52,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(_mapper.ConfigurationProvider); @@ -132,7 +133,7 @@ namespace IRaCIS.Core.Application.Services { // 从新作用域解析服务 var mediator = scope.ServiceProvider.GetRequiredService(); - await mediator.Publish(new TrialDocumentErverDayEvent { }); + await mediator.Publish(new TrialDocumentErverDayEvent { }); } }); return ResponseOutput.Result(true); @@ -175,7 +176,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, @@ -509,7 +510,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); @@ -519,7 +520,7 @@ namespace IRaCIS.Core.Application.Services var sysDataList = await _systemDocumentRepository.Where(x => sysids.Contains(x.Id)).Include(x => x.SystemDocumentAttachmentList).ToListAsync(); - + result.CurrentPageData.ForEach(x => { if (sysDataList.Any(y => y.Id == x.Id)) @@ -913,7 +914,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