diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 9d3aee7a5..5578ca2f8 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -5967,11 +5967,6 @@ ITrialExternalUserService - - - ITrialUserPreparation Service - - EmailNoticeConfigView 列表视图模型 @@ -8718,6 +8713,18 @@ 阅片问题.标准 + + + 获取自定义问题预览 + + + + + + 获取自定义表格问题预览 + + + 获取问题 @@ -9022,6 +9029,14 @@ + + + 获取阅片外层问题 + + + + + 获取阅片报告 @@ -9048,7 +9063,7 @@ - 获取表格问题及答案 只返回表格问题 + 获取表格问题及答案 只返回表格问题(任务和标准) diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index f20a2b63d..6d70cbdec 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -21,13 +21,13 @@ namespace IRaCIS.Core.Application.Services private readonly IRepository _trialDocumentRepository; - private readonly IRepository _trialDocUserTypeConfirmedUserRepository; + private readonly IRepository _trialDocUserTypeConfirmedUserRepository; private readonly IRepository _trialRepository; private readonly IRepository _systemDocConfirmedUserRepository; private readonly IRepository _systemDocumentRepository; public TrialDocumentService(IRepository trialDocumentRepository, - IRepository trialDocUserTypeConfirmedUserRepository, + IRepository trialDocUserTypeConfirmedUserRepository, IRepository trialRepository, IRepository systemDocConfirmedUserRepository , IRepository systemDocumentRepository) @@ -167,7 +167,7 @@ namespace IRaCIS.Core.Application.Services .WhereIf(!_userInfo.IsAdmin, t => t.IsDeleted == false || (t.IsDeleted == true && t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id))) join trialUser in _repository.Where(t => t.TrialId == querySystemDocument.TrialId && t.UserId == _userInfo.Id) on trialDoc.TrialId equals trialUser.TrialId - join confirm in _repository.Where(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on + join confirm in _repository.Where(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on new { trialUser.UserId, TrialDocumentId = trialDoc.Id } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc from confirm in cc.DefaultIfEmpty() select new UnionDocumentWithConfirmInfoView() @@ -272,7 +272,7 @@ namespace IRaCIS.Core.Application.Services .WhereIf(querySystemDocument.UserTypeId != null, t => t.User.UserTypeId == querySystemDocument.UserTypeId) on trialDocumentNeedConfirmedUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId - join confirm in _repository.Where(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on + join confirm in _repository.Where(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on new { trialUser.UserId, TrialDocumentId = trialDocumentNeedConfirmedUserType.TrialDocumentId } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc from confirm in cc.DefaultIfEmpty() select new UnionDocumentWithConfirmInfoView() @@ -493,7 +493,7 @@ namespace IRaCIS.Core.Application.Services if (!await _trialDocUserTypeConfirmedUserRepository.AnyAsync(t => t.TrialDocumentId == documentId && t.ConfirmUserId == _userInfo.Id)) { - await _repository.AddAsync(new TrialDocUserTypeConfirmedUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now }); + await _repository.AddAsync(new TrialDocConfirmedUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now }); } @@ -526,7 +526,7 @@ namespace IRaCIS.Core.Application.Services if (!await _trialDocUserTypeConfirmedUserRepository.AnyAsync(t => t.TrialDocumentId == documentId && t.ConfirmUserId == _userInfo.Id)) { - await _repository.AddAsync(new TrialDocUserTypeConfirmedUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now }); + await _repository.AddAsync(new TrialDocConfirmedUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now }); } var success = await _repository.SaveChangesAsync(); @@ -613,7 +613,7 @@ namespace IRaCIS.Core.Application.Services else { await _trialDocumentRepository.UpdatePartialFromQueryAsync(documentId, u => new TrialDocument() { IsDeleted = true }); - await _trialDocUserTypeConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.TrialDocumentId == documentId, x => new TrialDocUserTypeConfirmedUser() + await _trialDocUserTypeConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.TrialDocumentId == documentId, x => new TrialDocConfirmedUser() { IsDeleted = true }); diff --git a/IRaCIS.Core.Application/Service/Document/_MapConfig.cs b/IRaCIS.Core.Application/Service/Document/_MapConfig.cs index d1c4f6b36..f741b0db2 100644 --- a/IRaCIS.Core.Application/Service/Document/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Document/_MapConfig.cs @@ -40,7 +40,7 @@ namespace IRaCIS.Core.Application.Service // .ForMember(t => t.UserConfirmInfo, c => c.MapFrom(t => t.TrialDocConfirmedUserList.Where(u => u.ConfirmUserId == userId).FirstOrDefault())) // .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token)); ; - CreateMap() + CreateMap() .ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName)) .ForMember(d => d.RealName, c => c.MapFrom(t => t.User.FullName)); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs index 7471fd1fa..7bfc687aa 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs @@ -402,7 +402,7 @@ namespace IRaCIS.Application.Services await _repository.BatchDeleteAsync(t => t.TrialId == trialId) || await _repository.BatchDeleteAsync(t => t.TrialDocument.TrialId == trialId) || - await _repository.BatchDeleteAsync(t => t.TrialDocument.TrialId == trialId) || + await _repository.BatchDeleteAsync(t => t.TrialDocument.TrialId == trialId) || diff --git a/IRaCIS.Core.Domain/Abandon/ITrialUserPreparationService.cs b/IRaCIS.Core.Domain/Abandon/ITrialUserPreparationService.cs deleted file mode 100644 index 548a4aa65..000000000 --- a/IRaCIS.Core.Domain/Abandon/ITrialUserPreparationService.cs +++ /dev/null @@ -1,27 +0,0 @@ -//-------------------------------------------------------------------- -// 此代码由T4模板自动生成 byzhouhang 20210918 -// 生成时间 2022-03-24 13:22:50 -// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -//-------------------------------------------------------------------- - -using IRaCIS.Core.Application.ViewModel; -namespace IRaCIS.Core.Application.Interfaces -{ - /// - /// ITrialUserPreparation Service - /// - public interface ITrialUserPreparationService - { - - - //Task> GetTrialUserPreparationList(TrialUserPreparationQuery queryTrialUserPreparation ); - - - - //Task AddOrUpdateTrialUserPreparation (TrialUserPreparationAddOrEdit addOrEditTrialUserPreparation ); - - //Task DeleteTrialUserPreparation (Guid trialUserPreparationId); - - - } -} diff --git a/IRaCIS.Core.Domain/Document/TrialDocUserTypeConfirmedUser.cs b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs similarity index 92% rename from IRaCIS.Core.Domain/Document/TrialDocUserTypeConfirmedUser.cs rename to IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs index e705143fb..28fc35887 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocUserTypeConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs @@ -11,8 +11,8 @@ namespace IRaCIS.Core.Domain.Models /// ///TrialDocUserTypeConfirmUser /// - [Table("TrialDocUserTypeConfirmedUser")] - public class TrialDocUserTypeConfirmedUser : Entity, IAuditAdd + [Table("TrialDocConfirmedUser")] + public class TrialDocConfirmedUser : Entity, IAuditAdd { //public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Domain/Document/TrialDocument.cs b/IRaCIS.Core.Domain/Document/TrialDocument.cs index 1292d269a..48b3cca46 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocument.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocument.cs @@ -19,7 +19,7 @@ namespace IRaCIS.Core.Domain.Models //需要确认的项目用户 通过TrialId 关联 用中间表过滤 [JsonIgnore] - public List TrialDocConfirmedUserList { get; set; } + public List TrialDocConfirmedUserList { get; set; } [JsonIgnore] public List NeedConfirmedUserTypeList { get; set; } [JsonIgnore] diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index c7d279ae5..6dd018920 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -353,15 +353,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common } // 项目文件签署 - foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialDocUserTypeConfirmedUser))) + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialDocConfirmedUser))) { var type = GetEntityAuditOpt(item); - var entity = item.Entity as TrialDocUserTypeConfirmedUser; + var entity = item.Entity as TrialDocConfirmedUser; var trialDoc = await _dbContext.TrialDocument.Where(x => x.Id == entity.TrialDocumentId).FirstOrDefaultAsync(); - await InsertInspection(entity as TrialDocUserTypeConfirmedUser, type, x => new InspectionConvertDTO() + await InsertInspection(entity as TrialDocConfirmedUser, type, x => new InspectionConvertDTO() { TrialId = trialDoc.TrialId, @@ -1929,7 +1929,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common #region 标识符特殊处理 //文档签署这块，不区分系统和项目的 需要处理为同一个标识 - if (typeof(T) == typeof(TrialDocUserTypeConfirmedUser) || typeof(T) == typeof(SystemDocConfirmedUser)) + if (typeof(T) == typeof(TrialDocConfirmedUser) || typeof(T) == typeof(SystemDocConfirmedUser)) { entityTypeName = "New/" + "UserSigned"; } diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 105557b34..dc73944fd 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -389,7 +389,7 @@ namespace IRaCIS.Core.Infra.EFCore public virtual DbSet TrialDocNeedConfirmedUserType { get; set; } - public virtual DbSet TrialDocUserTypeConfirmUser { get; set; } + public virtual DbSet TrialDocConfirmedUser { get; set; } #endregion #region 暂时未用 diff --git a/IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialDocument.cs b/IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialDocument.cs index fb6b2c76c..ff8d813cf 100644 --- a/IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialDocument.cs +++ b/IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialDocument.cs @@ -20,11 +20,11 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration } } - public class TrialDocConfirmUserConfigration : IEntityTypeConfiguration + public class TrialDocConfirmUserConfigration : IEntityTypeConfiguration { - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) {