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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
he 2023-06-27 16:03:41 +08:00
parent 38205b3b97 ae7306a3ef
commit f0635ba323
9 changed files with 229 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
View File

@ -9,27 +9,22 @@ using System.Collections.Generic;
namespace IRaCIS.Core.Application.ViewModel
{
/// <summary> InternationalizationView 列表视图模型 </summary>
public class InternationalizationView
public class InternationalizationView : InternationalizationAddOrEdit
{
public Guid Id { get; set; }
public int ShowOrder { get; set; }
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
public DateTime UpdateTime { get; set; }
public Guid UpdateUserId { get; set; }
public int State { get; set; }
public string FolderPath { get; set; }
public string Code { get; set; }
public string Value { get; set; }
public string ValueCN { get; set; }
}
///<summary>InternationalizationQuery 列表查询参数模型</summary>
public class InternationalizationQuery:PageInput
public class InternationalizationQuery : PageInput
{
public string? FolderPath { get; set; }
public string? Code { get; set; }
public string? FolderPath { get; set; }
public string? Code { get; set; }
public string? Value { get; set; }
public string? ValueCN { get; set; }

44
IRaCIS.Core.Application/Service/Common/DTO/PublishLogViewModel.cs Normal file
View File

@ -0,0 +1,44 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-06-27 15:47:02
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using System;
using IRaCIS.Core.Domain.Share;
using System.Collections.Generic;
namespace IRaCIS.Core.Application.ViewModel
{
/// <summary> PublishLogView 列表视图模型 </summary>
public class PublishLogView : PublishLogAddOrEdit
{
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
}
///<summary>PublishLogQuery 列表查询参数模型</summary>
public class PublishLogQuery:PageInput
{
public string? Version { get; set; }
public string? UpdateContent { get; set; }
}
///<summary> PublishLogAddOrEdit 列表查询参数模型</summary>
public class PublishLogAddOrEdit
{
public Guid? Id { get; set; }
public string Version { get; set; }
public DateTime PublishTime { get; set; }
public string UpdateContent { get; set; }
}
}

24
IRaCIS.Core.Application/Service/Common/Interface/IPublishLogService.cs Normal file
View File

@ -0,0 +1,24 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-06-27 15:47:10
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Application.ViewModel;
namespace IRaCIS.Core.Application.Interfaces
{
/// <summary>
/// IPublishLogService
/// </summary>
public interface IPublishLogService
{
Task<PageOutput<PublishLogView>> GetPublishLogList(PublishLogQuery inQuery);
Task<IResponseOutput> AddOrUpdatePublishLog(PublishLogAddOrEdit addOrEditPublishLog);
Task<IResponseOutput> DeletePublishLog(Guid publishLogId);
}
}

6
IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
View File

@ -29,9 +29,9 @@ namespace IRaCIS.Core.Application.Service
var internationalizationQueryable =_internationalizationRepository
.WhereIf(inQuery.FolderPath!=null,t=>t.FolderPath.Contains(inQuery.FolderPath))
.WhereIf(inQuery.Code != null, t => t.FolderPath.Contains(inQuery.Code))
.WhereIf(inQuery.Value != null, t => t.FolderPath.Contains(inQuery.Value))
.WhereIf(inQuery.ValueCN != null, t => t.FolderPath.Contains(inQuery.ValueCN))
.WhereIf(inQuery.Code != null, t => t.FolderPath.Contains(inQuery.Code))
.WhereIf(inQuery.Value != null, t => t.FolderPath.Contains(inQuery.Value))
.WhereIf(inQuery.ValueCN != null, t => t.FolderPath.Contains(inQuery.ValueCN))
.ProjectTo<InternationalizationView>(_mapper.ConfigurationProvider);
var pageList = await internationalizationQueryable

71
IRaCIS.Core.Application/Service/Common/PublishLogService.cs Normal file
View File

@ -0,0 +1,71 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-06-27 15:47:06
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Domain.Models;
using Microsoft.AspNetCore.Mvc;
using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Application.Contracts;
namespace IRaCIS.Core.Application.Service
{
/// <summary>
/// PublishLogService
/// </summary>
[ApiExplorerSettings(GroupName = "Common")]
public class PublishLogService : BaseService, IPublishLogService
{
private readonly IRepository<PublishLog> _publishLogRepository;
public PublishLogService(IRepository<PublishLog> publishLogRepository)
{
_publishLogRepository = publishLogRepository;
}
public async Task<PageOutput<PublishLogView>> GetPublishLogList(PublishLogQuery inQuery)
{
var publishLogQueryable = _publishLogRepository
.WhereIf(!string.IsNullOrEmpty(inQuery.Version) , t => t.Version.Contains(inQuery.Version))
.WhereIf(!string.IsNullOrEmpty(inQuery.UpdateContent), t => t.UpdateContent.Contains(inQuery.UpdateContent))
.ProjectTo<PublishLogView>(_mapper.ConfigurationProvider);
var pageList = await publishLogQueryable
.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
return pageList;
}
public async Task<IResponseOutput> AddOrUpdatePublishLog(PublishLogAddOrEdit addOrEditPublishLog)
{
var verifyExp1 = new EntityVerifyExp<PublishLog>()
{
VerifyExp = u => u.Version == addOrEditPublishLog.Version ,
VerifyMsg = "发布编号不能重复"
};
var entity = await _publishLogRepository.InsertOrUpdateAsync(addOrEditPublishLog, true, verifyExp1);
return ResponseOutput.Ok(entity.Id.ToString());
}
[HttpDelete("{publishLogId:guid}")]
public async Task<IResponseOutput> DeletePublishLog(Guid publishLogId)
{
var success = await _publishLogRepository.DeleteFromQueryAsync(t => t.Id == publishLogId, true);
return ResponseOutput.Ok();
}
}
}

3
IRaCIS.Core.Application/Service/Common/_MapConfig.cs
View File

@ -57,6 +57,9 @@ namespace IRaCIS.Core.Application.Service
CreateMap<Internationalization, InternationalizationView>();
CreateMap<Internationalization, InternationalizationAddOrEdit>().ReverseMap();
CreateMap<PublishLog, PublishLogView>();
CreateMap<PublishLog, PublishLogAddOrEdit>().ReverseMap();
}
}

22
IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
View File

@ -323,7 +323,7 @@ namespace IRaCIS.Core.Application
ToBeApprovalCount = t.EnrollList.Where(u => u.EnrollStatus == EnrollStatus.HasCommittedToCRO).Count()
});
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReviewerSelectToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
var toBeApprovalCount = await _enrollRepository.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
.Where(u => u.EnrollStatus == EnrollStatus.HasCommittedToCRO).CountAsync();
@ -361,7 +361,7 @@ namespace IRaCIS.Core.Application
});
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReReadingApprovalToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
var toBeApprovalCount = _visitTaskReReadingRepository
.Where(t => t.OriginalReReadingTask.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@ -403,7 +403,7 @@ namespace IRaCIS.Core.Application
});
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageClinicalDataToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
var toBeDealedCount = _subjectVisitRepository
.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.Trial.clinicalDataTrialSets.Any(t => t.ClinicalDataLevel == ClinicalLevel.Subject && t.IsConfirm))
@ -450,7 +450,7 @@ namespace IRaCIS.Core.Application
});
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageQuestionToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
var toBeDealedCount = _subjectVisitRepository
.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@ -494,7 +494,7 @@ namespace IRaCIS.Core.Application
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageCheckQuestionToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
var toBeDealedCount = _subjectVisitRepository
.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@ -537,7 +537,7 @@ namespace IRaCIS.Core.Application
});
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageReUploadToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
var toBeDealedCount = _subjectVisitRepository
.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@ -581,7 +581,7 @@ namespace IRaCIS.Core.Application
});
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageSubmittedToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
var toBeDealedCount = _subjectVisitRepository
.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@ -634,7 +634,7 @@ namespace IRaCIS.Core.Application
});
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageQualityToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
var toBeClaimedCount = _subjectVisitRepository
@ -679,7 +679,7 @@ namespace IRaCIS.Core.Application
});
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageQuestionToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
var toBeDealedCount = _subjectVisitRepository
.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@ -879,7 +879,7 @@ namespace IRaCIS.Core.Application
});
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(MedicalCommentsToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
var toBeDealedCount = _taskMedicalReviewRepository
.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@ -939,7 +939,7 @@ namespace IRaCIS.Core.Application
});
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(MedicalCommentsToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
var toBeReplyedQuery = _taskMedicalReviewRepository
.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))

64
IRaCIS.Core.Domain/Common/PublishLog.cs Normal file
View File

@ -0,0 +1,64 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-06-27 15:46:59
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///PublishLog
///</summary>
[Table("PublishLog")]
public class PublishLog : Entity, IAuditUpdate, IAuditAdd
{
/// <summary>
/// Version
/// </summary>
[Required]
public string Version { get; set; }
/// <summary>
/// PublishTime
/// </summary>
[Required]
public DateTime PublishTime { get; set; }
/// <summary>
/// UpdateContent
/// </summary>
[Required]
public string UpdateContent { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// UpdateUserId
/// </summary>
[Required]
public Guid UpdateUserId { get; set; }
/// <summary>
/// UpdateTime
/// </summary>
[Required]
public DateTime UpdateTime { get; set; }
}
}

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

@ -507,6 +507,9 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet<ReadingTableQuestionAnswer> ReadingTableQuestionAnswer { get; set; }
public virtual DbSet<PublishLog> PublishLog { get; set; }
#region 废弃