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

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 Details

Uat_IRC_Net8
hang 2025-05-09 09:09:11 +08:00
parent ba9d3a30b9 10cf908775
commit e205ea0018
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/MassTransit/Consumer/Dto/SendImageReuploadEmailDto.cs
View File

@ -21,6 +21,8 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer.Dto
public RequestBackStateEnum RequestBackStateEnum { get; set; } = RequestBackStateEnum.NotRequest; public RequestBackStateEnum RequestBackStateEnum { get; set; } = RequestBackStateEnum.NotRequest;
public ReReadingApplyState ReReadingApplyState { get; set; } = ReReadingApplyState.Default;

17
IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs
View File

@ -248,7 +248,8 @@ public class ImageConsumer(
EmailNoticeConfig = emailConfig, EmailNoticeConfig = emailConfig,
Scenario = scenario, Scenario = scenario,
SubjectVisit = subjectVisit, SubjectVisit = subjectVisit,
TrialId = trialId TrialId = trialId,
ReReadingApplyState= context.Message.ReReadingApplyState,
}; };
await SendImageReuploadEmail(inDto); await SendImageReuploadEmail(inDto);
} }
@ -327,16 +328,18 @@ public class ImageConsumer(
List<DictionaryDto> dictionaryDtos = new List<DictionaryDto>() { List<DictionaryDto> dictionaryDtos = new List<DictionaryDto>() {
new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=inDto.SubjectVisit.IsUrgent.ToString().ToLower(), }, //是否加急 new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=inDto.SubjectVisit.IsUrgent.ToString().ToLower(), }, //是否加急
}; };
if (inDto.Scenario == EmailBusinessScenario.DataReconciliation_PMApprovalRe_Uploading) switch (inDto.Scenario)
{ {
case EmailBusinessScenario.Re_ReadApproval_SPMCPMApprovalRe_Reading:
dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ReReadingApplyState", EnumValue = inDto.ReReadingApplyState.GetEnumInt(), });
break;
case EmailBusinessScenario.DataReconciliation_PMApprovalRe_Uploading:
dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "RequestBackState", EnumValue = inDto.RequestBackStateEnum.GetEnumInt(), }); dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "RequestBackState", EnumValue = inDto.RequestBackStateEnum.GetEnumInt(), });
} break;
else default:
{
dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ImageBackStateEnum", EnumValue = inDto.ImageBackStateEnum.GetEnumInt(), });//审批结果 dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ImageBackStateEnum", EnumValue = inDto.ImageBackStateEnum.GetEnumInt(), });//审批结果
break;
} }
var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto() var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
{ {

10
IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs
View File

@ -252,9 +252,12 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
var root = query var root = query
.Skip(inDto.PageSize * (inDto.PageIndex - 1)).Take(inDto.PageSize).ToList(); .Skip(inDto.PageSize * (inDto.PageIndex - 1)).Take(inDto.PageSize).ToList();
var historicalVersionList = await _auditDocumentRepository
.Where(x => x.AuditDocumentTypeEnum == AuditDocumentType.HistoricalVersion).ProjectTo<AuditDocumentData>(_mapper.ConfigurationProvider).ToListAsync();
foreach (var item in root) foreach (var item in root)
{ {
GetChildren(item, data); GetChildren(item, data, historicalVersionList);
} }
result.CurrentPageData = root; result.CurrentPageData = root;
@ -275,12 +278,13 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
} }
private void GetChildren(AuditDocumentData item, List<AuditDocumentData> dataList) private void GetChildren(AuditDocumentData item, List<AuditDocumentData> dataList, List<AuditDocumentData> historyList)
{ {
item.Children = dataList.Where(x => x.ParentId == item.Id).ToList(); item.Children = dataList.Where(x => x.ParentId == item.Id).ToList();
item.HistoricalVersionsCount= historyList.Where(x => x.MainFileId == item.Id).Count();
foreach (var x in item.Children) foreach (var x in item.Children)
{ {
GetChildren(x, dataList); GetChildren(x, dataList, historyList);
} }
} }

5
IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs
View File

@ -47,7 +47,12 @@ public class AuditDocumentData : AuditDocumentUpdateDto
public DateTime UpdateTime { get; set; } public DateTime UpdateTime { get; set; }
public Guid? MainFileId { get; set; }
public int? Version { get; set; } public int? Version { get; set; }
public int HistoricalVersionsCount { get; set; }
public List<AuditDocumentData> Children { get; set; }=new List<AuditDocumentData> (){ }; public List<AuditDocumentData> Children { get; set; }=new List<AuditDocumentData> (){ };
} }