XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改表名

Uat_Study
hang 2022-11-22 15:33:16 +08:00
parent 13259d114b
commit 6c1a257179
10 changed files with 40 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -5967,11 +5967,6 @@
ITrialExternalUserService ITrialExternalUserService
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.Interfaces.ITrialUserPreparationService">
<summary>
ITrialUserPreparation Service
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Contracts.EmailNoticeConfigView"> <member name="T:IRaCIS.Core.Application.Contracts.EmailNoticeConfigView">
<summary> EmailNoticeConfigView 列表视图模型 </summary> <summary> EmailNoticeConfigView 列表视图模型 </summary>
</member> </member>
@ -8718,6 +8713,18 @@
阅片问题.标准 阅片问题.标准
</summary> </summary>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetCustomQuestionPreview(IRaCIS.Core.Application.Service.Reading.Dto.GetCustomQuestionPreviewInDto)">
<summary>
获取自定义问题预览
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetCustomTableQuestionPreview(IRaCIS.Core.Application.Service.Reading.Dto.GetCustomQuestionPreviewInDto)">
<summary>
获取自定义表格问题预览
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetCalculateQuestions(IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateQuestionsInDto)"> <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetCalculateQuestions(IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateQuestionsInDto)">
<summary> <summary>
获取问题 获取问题
@ -9022,6 +9029,14 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingQuestion(System.Guid,System.Nullable{System.Guid})">
<summary>
获取阅片外层问题
</summary>
<param name="trialReadingCriterionId"></param>
<param name="visitTaskId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingReportEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingReportEvaluationInDto)"> <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingReportEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingReportEvaluationInDto)">
<summary> <summary>
获取阅片报告 获取阅片报告
@ -9048,7 +9063,7 @@
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingTableQuestion(System.Guid,System.Nullable{System.Guid},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableAnsweRowInfo})"> <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingTableQuestion(System.Guid,System.Nullable{System.Guid},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableAnsweRowInfo})">
<summary> <summary>
获取表格问题及答案 只返回表格问题 获取表格问题及答案 只返回表格问题(任务和标准)
</summary> </summary>
<param name="trialReadingCriterionId"></param> <param name="trialReadingCriterionId"></param>
<param name="taskId"></param> <param name="taskId"></param>

14
IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
View File

@ -21,13 +21,13 @@ namespace IRaCIS.Core.Application.Services
private readonly IRepository<TrialDocument> _trialDocumentRepository; private readonly IRepository<TrialDocument> _trialDocumentRepository;
private readonly IRepository<TrialDocUserTypeConfirmedUser> _trialDocUserTypeConfirmedUserRepository; private readonly IRepository<TrialDocConfirmedUser> _trialDocUserTypeConfirmedUserRepository;
private readonly IRepository<Trial> _trialRepository; private readonly IRepository<Trial> _trialRepository;
private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository; private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository;
private readonly IRepository<SystemDocument> _systemDocumentRepository; private readonly IRepository<SystemDocument> _systemDocumentRepository;
public TrialDocumentService(IRepository<TrialDocument> trialDocumentRepository, public TrialDocumentService(IRepository<TrialDocument> trialDocumentRepository,
IRepository<TrialDocUserTypeConfirmedUser> trialDocUserTypeConfirmedUserRepository, IRepository<TrialDocConfirmedUser> trialDocUserTypeConfirmedUserRepository,
IRepository<Trial> trialRepository, IRepository<Trial> trialRepository,
IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository
, IRepository<SystemDocument> systemDocumentRepository) , IRepository<SystemDocument> 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))) .WhereIf(!_userInfo.IsAdmin, t => t.IsDeleted == false || (t.IsDeleted == true && t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id)))
join trialUser in _repository.Where<TrialUser>(t => t.TrialId == querySystemDocument.TrialId && t.UserId == _userInfo.Id) on trialDoc.TrialId equals trialUser.TrialId join trialUser in _repository.Where<TrialUser>(t => t.TrialId == querySystemDocument.TrialId && t.UserId == _userInfo.Id) on trialDoc.TrialId equals trialUser.TrialId
join confirm in _repository.Where<TrialDocUserTypeConfirmedUser>(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on join confirm in _repository.Where<TrialDocConfirmedUser>(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on
new { trialUser.UserId, TrialDocumentId = trialDoc.Id } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc new { trialUser.UserId, TrialDocumentId = trialDoc.Id } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
from confirm in cc.DefaultIfEmpty() from confirm in cc.DefaultIfEmpty()
select new UnionDocumentWithConfirmInfoView() select new UnionDocumentWithConfirmInfoView()
@ -272,7 +272,7 @@ namespace IRaCIS.Core.Application.Services
.WhereIf(querySystemDocument.UserTypeId != null, t => t.User.UserTypeId == querySystemDocument.UserTypeId) .WhereIf(querySystemDocument.UserTypeId != null, t => t.User.UserTypeId == querySystemDocument.UserTypeId)
on trialDocumentNeedConfirmedUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId on trialDocumentNeedConfirmedUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId
join confirm in _repository.Where<TrialDocUserTypeConfirmedUser>(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on join confirm in _repository.Where<TrialDocConfirmedUser>(t => t.TrialDocument.TrialId == querySystemDocument.TrialId) on
new { trialUser.UserId, TrialDocumentId = trialDocumentNeedConfirmedUserType.TrialDocumentId } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc new { trialUser.UserId, TrialDocumentId = trialDocumentNeedConfirmedUserType.TrialDocumentId } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
from confirm in cc.DefaultIfEmpty() from confirm in cc.DefaultIfEmpty()
select new UnionDocumentWithConfirmInfoView() select new UnionDocumentWithConfirmInfoView()
@ -493,7 +493,7 @@ namespace IRaCIS.Core.Application.Services
if (!await _trialDocUserTypeConfirmedUserRepository.AnyAsync(t => t.TrialDocumentId == documentId && t.ConfirmUserId == _userInfo.Id)) 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)) 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(); var success = await _repository.SaveChangesAsync();
@ -613,7 +613,7 @@ namespace IRaCIS.Core.Application.Services
else else
{ {
await _trialDocumentRepository.UpdatePartialFromQueryAsync(documentId, u => new TrialDocument() { IsDeleted = true }); 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 IsDeleted = true
}); });

2
IRaCIS.Core.Application/Service/Document/_MapConfig.cs
View File

@ -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(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)); ; // .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token)); ;
CreateMap<TrialDocUserTypeConfirmedUser, TrialDocumentUserConfirmView>() CreateMap<TrialDocConfirmedUser, TrialDocumentUserConfirmView>()
.ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName)) .ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName))
.ForMember(d => d.RealName, c => c.MapFrom(t => t.User.FullName)); .ForMember(d => d.RealName, c => c.MapFrom(t => t.User.FullName));

2
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
View File

@ -402,7 +402,7 @@ namespace IRaCIS.Application.Services
await _repository.BatchDeleteAsync<TrialDocument>(t => t.TrialId == trialId) || await _repository.BatchDeleteAsync<TrialDocument>(t => t.TrialId == trialId) ||
await _repository.BatchDeleteAsync<TrialDocNeedConfirmedUserType>(t => t.TrialDocument.TrialId == trialId) || await _repository.BatchDeleteAsync<TrialDocNeedConfirmedUserType>(t => t.TrialDocument.TrialId == trialId) ||
await _repository.BatchDeleteAsync<TrialDocUserTypeConfirmedUser>(t => t.TrialDocument.TrialId == trialId) || await _repository.BatchDeleteAsync<TrialDocConfirmedUser>(t => t.TrialDocument.TrialId == trialId) ||

27
IRaCIS.Core.Domain/Abandon/ITrialUserPreparationService.cs
View File

@ -1,27 +0,0 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-03-24 13:22:50
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Application.ViewModel;
namespace IRaCIS.Core.Application.Interfaces
{
/// <summary>
/// ITrialUserPreparation Service
/// </summary>
public interface ITrialUserPreparationService
{
//Task<List<TrialUserPreparationView>> GetTrialUserPreparationList(TrialUserPreparationQuery queryTrialUserPreparation );
//Task<IResponseOutput> AddOrUpdateTrialUserPreparation (TrialUserPreparationAddOrEdit addOrEditTrialUserPreparation );
//Task<IResponseOutput> DeleteTrialUserPreparation (Guid trialUserPreparationId);
}
}

4
IRaCIS.Core.Domain/Document/TrialDocUserTypeConfirmedUser.cs → IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs
View File

@ -11,8 +11,8 @@ namespace IRaCIS.Core.Domain.Models
///<summary> ///<summary>
///TrialDocUserTypeConfirmUser ///TrialDocUserTypeConfirmUser
///</summary> ///</summary>
[Table("TrialDocUserTypeConfirmedUser")] [Table("TrialDocConfirmedUser")]
public class TrialDocUserTypeConfirmedUser : Entity, IAuditAdd public class TrialDocConfirmedUser : Entity, IAuditAdd
{ {
//public Guid TrialId { get; set; } //public Guid TrialId { get; set; }

2
IRaCIS.Core.Domain/Document/TrialDocument.cs
View File

@ -19,7 +19,7 @@ namespace IRaCIS.Core.Domain.Models
//需要确认的项目用户 通过TrialId 关联 用中间表过滤 //需要确认的项目用户 通过TrialId 关联 用中间表过滤
[JsonIgnore] [JsonIgnore]
public List<TrialDocUserTypeConfirmedUser> TrialDocConfirmedUserList { get; set; } public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
[JsonIgnore] [JsonIgnore]
public List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; } public List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
[JsonIgnore] [JsonIgnore]

8
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -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 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(); var trialDoc = await _dbContext.TrialDocument.Where(x => x.Id == entity.TrialDocumentId).FirstOrDefaultAsync();
await InsertInspection<TrialDocUserTypeConfirmedUser>(entity as TrialDocUserTypeConfirmedUser, type, x => new InspectionConvertDTO() await InsertInspection<TrialDocConfirmedUser>(entity as TrialDocConfirmedUser, type, x => new InspectionConvertDTO()
{ {
TrialId = trialDoc.TrialId, TrialId = trialDoc.TrialId,
@ -1929,7 +1929,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
#region 标识符特殊处理 #region 标识符特殊处理
//文档签署这块，不区分系统和项目的 需要处理为同一个标识 //文档签署这块，不区分系统和项目的 需要处理为同一个标识
if (typeof(T) == typeof(TrialDocUserTypeConfirmedUser) || typeof(T) == typeof(SystemDocConfirmedUser)) if (typeof(T) == typeof(TrialDocConfirmedUser) || typeof(T) == typeof(SystemDocConfirmedUser))
{ {
entityTypeName = "New/" + "UserSigned"; entityTypeName = "New/" + "UserSigned";
} }

2
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -389,7 +389,7 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet<TrialDocNeedConfirmedUserType> TrialDocNeedConfirmedUserType { get; set; } public virtual DbSet<TrialDocNeedConfirmedUserType> TrialDocNeedConfirmedUserType { get; set; }
public virtual DbSet<TrialDocUserTypeConfirmedUser> TrialDocUserTypeConfirmUser { get; set; } public virtual DbSet<TrialDocConfirmedUser> TrialDocConfirmedUser { get; set; }
#endregion #endregion
#region 暂时未用 #region 暂时未用

4
IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialDocument.cs
View File

@ -20,11 +20,11 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
} }
} }
public class TrialDocConfirmUserConfigration : IEntityTypeConfiguration<TrialDocUserTypeConfirmedUser> public class TrialDocConfirmUserConfigration : IEntityTypeConfiguration<TrialDocConfirmedUser>
{ {
public void Configure(EntityTypeBuilder<TrialDocUserTypeConfirmedUser> builder) public void Configure(EntityTypeBuilder<TrialDocConfirmedUser> builder)
{ {