Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing

This commit is contained in:
he
2025-10-13 16:19:19 +08:00
7 changed files with 20392 additions and 2 deletions
@@ -84,6 +84,13 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
[HttpPost]
public async Task<PageOutput<AuditRecordView>> GetAuditRecordList(AuditRecordQuery inQuery)
{
var isEA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA;
//EA 但是没有在进行的培训记录查看权限,那么返回空数据
if (isEA && !_auditRecordRepository.Any(t => t.IsViewTrainingRecord && t.AuditState == AuditState.Ongoing))
{
return new PageOutput<AuditRecordView>();
}
var auditRecordQueryable = _auditRecordRepository
.WhereIf(inQuery.BeginAuditTime != null, t => t.AuditTime >= inQuery.BeginAuditTime)
@@ -693,7 +700,7 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
public async Task<IResponseOutput> CopyFileOrFolder(MovieFileOrFolderInDto inDto)
{
foreach (var item in inDto.Ids)
{
@@ -49,6 +49,8 @@ public class AuditRecordAddOrEdit
public AuditType AuditType { get; set; }
public bool IsViewTrainingRecord { get; set; }
//public List<Guid> IdnetityUserIdList { get; set; }
}
@@ -466,7 +466,7 @@ namespace IRaCIS.Core.Application.Service
//访视计划 整体状态变更为 确认
await _visitStageRepository.UpdatePartialFromQueryAsync(u => u.TrialId == trialId && u.IsConfirmed == false, t => new VisitStage() { IsConfirmed = true, IsHaveFirstConfirmed = true });
await _visitStageRepository.UpdatePartialFromQueryAsync(u => u.TrialId == trialId && u.IsConfirmed == false, t => new VisitStage() { IsConfirmed = true, IsHaveFirstConfirmed = true },ignoreQueryFilter:true);
await _visitStageRepository.SaveChangesAsync();
return ResponseOutput.Ok();