From 6508698bdaaa51149d5382b5c9199f437822fc8d Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 9 Jun 2025 13:39:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 19c8b2a1d..a462dbfd6 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1281,6 +1281,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public int? OtherNumberOfFrames { get; set; } public string? OtherMeasureData { get; set; } + + /// + /// 表格问题标记 + /// + public Guid? RowId { get; set; } + + public Guid? TableQuestionId { get; set; } } public class GetReadingQuestionAndAnswerInDto { From ef31afa1d8246fb2ee4dee1c866203da9dc4a265 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 9 Jun 2025 14:14:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Document/TrialDocumentService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index b05b486e2..1ec64abef 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -110,7 +110,7 @@ namespace IRaCIS.Core.Application.Services { // 从新作用域解析服务 var mediator = scope.ServiceProvider.GetRequiredService(); - await mediator.Publish(new SystemDocumentPublishEvent { Ids = inDto.Ids }); + await mediator.Publish(new TrialDocumentPublishEvent { Ids = inDto.Ids }); } }); From a2afe4f6e46326950d70cbc14c0de584d3ea2931 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 9 Jun 2025 14:44:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Recurring/TrialDocumentConsumer.cs | 8 ++++++-- .../Document/TrialHistoryRecordFileService.cs | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs index b0e97c149..f6e36f723 100644 --- a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs @@ -154,7 +154,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring IRepository _visitTaskRepository, IRepository _trialDocumentRepository, IRepository _identityUserRepository, - + IRepository _trialIdentityUserRepository, IRepository _dictionaryRepository, IRepository _trialUserRoleRepository, IRepository _emailNoticeConfigrepository, @@ -180,8 +180,10 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring // 只查询新增角色的用户 systemDocQuery = from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id)) + join trialIdentityUser in _trialIdentityUserRepository.AsQueryable() on trialDoc.TrialId equals trialIdentityUser.TrialId from identityUser in _identityUserRepository.AsQueryable(false) .Where(t => t.Status == UserStateEnum.Enable && + t.Id == trialIdentityUser.IdentityUserId && t.UserRoleList.Where(t => t.IsUserRoleDisabled == false) .Any(t => context.Message.NewUserTypeIds.Contains(t.UserTypeId) && trialDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId))) @@ -208,13 +210,15 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring // 查询所有相关角色的用户 systemDocQuery = from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id)) + join trialIdentityUser in _trialIdentityUserRepository.AsQueryable() on trialDoc.TrialId equals trialIdentityUser.TrialId from identityUser in _identityUserRepository.AsQueryable(false) .Where(t => t.Status == UserStateEnum.Enable && + t.Id== trialIdentityUser.IdentityUserId&& t.UserRoleList.Where(t => t.IsUserRoleDisabled == false) .Any(t => trialDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId))) select new UnionDocumentWithConfirmInfoView() { - IsSystemDoc = true, + IsSystemDoc = false, Id = trialDoc.Id, CreateTime = trialDoc.CreateTime, IsDeleted = trialDoc.IsDeleted, diff --git a/IRaCIS.Core.Application/Service/Document/TrialHistoryRecordFileService.cs b/IRaCIS.Core.Application/Service/Document/TrialHistoryRecordFileService.cs index bfa69f3a6..6dc373690 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialHistoryRecordFileService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialHistoryRecordFileService.cs @@ -11,6 +11,7 @@ using IRaCIS.Core.Infrastructure.Extention; using System.Threading.Tasks; using IRaCIS.Core.Infra.EFCore; using IRaCIS.Core.Application.Service.DTO; +using IRaCIS.Core.Application.MassTransit.Command; namespace IRaCIS.Core.Application.Service; /// @@ -41,6 +42,21 @@ public class TrialHistoryRecordFileService(IRepository _ return pageList; } + /// + /// 批量新增稽查记录文件 + /// + /// + /// + [HttpPost] + public async Task BatchAddTrialHistoryRecordFile(List inDto) + { + List entities = _mapper.Map>(inDto); + await _trialHistoryRecordFileRepository.AddRangeAsync(entities); + + await _trialHistoryRecordFileRepository.SaveChangesAsync(); + return ResponseOutput.Ok(true); + } + /// /// 新增或修改稽查记录文件 ///