合并
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
1f8caa4616
|
@ -1473,6 +1473,13 @@
|
|||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.TrialFileTypeService.GetTrialFileTypeData(IRaCIS.Core.Application.ViewModel.GetTrialFileTypeDataInDto)">
|
||||
<summary>
|
||||
获取项目文件类型数据
|
||||
</summary>
|
||||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.Service.TrialFinalRecordService">
|
||||
<summary>
|
||||
项目定稿记录
|
||||
|
@ -14169,6 +14176,11 @@
|
|||
<member name="T:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigAddOrEdit">
|
||||
<summary> TrialEmailNoticeConfigAddOrEdit 列表查询参数模型</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.ViewModel.TrialFileTypeAddOrEdit.ShowOrder">
|
||||
<summary>
|
||||
显示顺序
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.ViewModel.SystemAnonymizationView">
|
||||
<summary> SystemAnonymizationView 列表视图模型 </summary>
|
||||
</member>
|
||||
|
|
|
@ -20,6 +20,25 @@ public class TrialFileTypeView : TrialFileTypeAddOrEdit
|
|||
|
||||
}
|
||||
|
||||
public class GetTrialFileTypeDataOutDto
|
||||
{
|
||||
public List<TrialFileTypeData> TrialFileTypeDataList { get; set; }
|
||||
}
|
||||
|
||||
public class TrialFileTypeData
|
||||
{
|
||||
public ArchiveType ArchiveTypeEnum { get; set; }
|
||||
|
||||
public List<TrialFileTypeView> TrialFileTypeList { get; set; }
|
||||
}
|
||||
|
||||
|
||||
public class GetTrialFileTypeDataInDto
|
||||
{
|
||||
public Guid TrialId { get; set; }
|
||||
|
||||
public bool IsCheck { get; set; } = false;
|
||||
}
|
||||
public class CopySystemFileTypeToTrialInDto
|
||||
{
|
||||
public Guid TrialId { get; set; }
|
||||
|
@ -62,6 +81,11 @@ public class TrialFileTypeAddOrEdit
|
|||
public Guid? SysFileTypeId { get; set; }
|
||||
|
||||
public Guid TrialId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 显示顺序
|
||||
/// </summary>
|
||||
public int ShowOrder { get; set; }
|
||||
}
|
||||
|
||||
public class TrialFileTypeQuery : PageInput
|
||||
|
|
|
@ -125,6 +125,34 @@ public class TrialFileTypeService(IRepository<TrialFileType> _trialFileTypeRepos
|
|||
return ResponseOutput.Ok();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取项目文件类型数据
|
||||
/// </summary>
|
||||
/// <param name="inDto"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<GetTrialFileTypeDataOutDto> GetTrialFileTypeData(GetTrialFileTypeDataInDto inDto)
|
||||
{
|
||||
await this.CopySystemFileTypeToTrial(new CopySystemFileTypeToTrialInDto()
|
||||
{
|
||||
TrialId = inDto.TrialId
|
||||
});
|
||||
var trialFileTypeList = await _trialFileTypeRepository.Where(x=>x.TrialId==inDto.TrialId)
|
||||
.WhereIf(inDto.IsCheck, x => x.IsEnable)
|
||||
.OrderBy(x=>x.ShowOrder)
|
||||
.ProjectTo<TrialFileTypeView>(_mapper.ConfigurationProvider)
|
||||
.ToListAsync();
|
||||
|
||||
List<TrialFileTypeData> result= trialFileTypeList.GroupBy(x =>new { x.ArchiveTypeEnum},(key,list)=>new TrialFileTypeData() {
|
||||
ArchiveTypeEnum= key.ArchiveTypeEnum,
|
||||
TrialFileTypeList=list.OrderBy(y=>y.ShowOrder).ToList(),
|
||||
}).OrderBy(x=>x.ArchiveTypeEnum).ToList();
|
||||
|
||||
return new GetTrialFileTypeDataOutDto() { TrialFileTypeDataList = result };
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -100,6 +100,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
CreateMap<SysFileType, SysFileTypeAddOrEdit>().ReverseMap();
|
||||
|
||||
CreateMap<TrialFileType, TrialFileTypeView>();
|
||||
|
||||
CreateMap<TrialFileType, TrialFileTypeAddOrEdit>().ReverseMap();
|
||||
|
||||
CreateMap<TrialFinalRecord, TrialFinalRecordView>();
|
||||
|
|
Loading…
Reference in New Issue