Compare commits
No commits in common. "cff6b87daa9f59b0521df5d76a89336b29c3978f" and "1856ef948308f6b95907b6ef9037411b9e85cb15" have entirely different histories.
cff6b87daa
...
1856ef9483
|
|
@ -1466,13 +1466,6 @@
|
||||||
<param name="inQuery"></param>
|
<param name="inQuery"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.TrialFileTypeService.CopySystemFileTypeToTrial(IRaCIS.Core.Application.ViewModel.CopySystemFileTypeToTrialInDto)">
|
|
||||||
<summary>
|
|
||||||
复制系统数据到项目
|
|
||||||
</summary>
|
|
||||||
<param name="inDto"></param>
|
|
||||||
<returns></returns>
|
|
||||||
</member>
|
|
||||||
<member name="T:IRaCIS.Core.Application.Service.TrialFinalRecordService">
|
<member name="T:IRaCIS.Core.Application.Service.TrialFinalRecordService">
|
||||||
<summary>
|
<summary>
|
||||||
项目定稿记录
|
项目定稿记录
|
||||||
|
|
|
||||||
|
|
@ -20,25 +20,6 @@ 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 class CopySystemFileTypeToTrialInDto
|
||||||
{
|
{
|
||||||
public Guid TrialId { get; set; }
|
public Guid TrialId { get; set; }
|
||||||
|
|
@ -81,11 +62,6 @@ public class TrialFileTypeAddOrEdit
|
||||||
public Guid? SysFileTypeId { get; set; }
|
public Guid? SysFileTypeId { get; set; }
|
||||||
|
|
||||||
public Guid TrialId { get; set; }
|
public Guid TrialId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 显示顺序
|
|
||||||
/// </summary>
|
|
||||||
public int ShowOrder { get; set; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class TrialFileTypeQuery : PageInput
|
public class TrialFileTypeQuery : PageInput
|
||||||
|
|
|
||||||
|
|
@ -125,30 +125,6 @@ public class TrialFileTypeService(IRepository<TrialFileType> _trialFileTypeRepos
|
||||||
return ResponseOutput.Ok();
|
return ResponseOutput.Ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 获取项目文件类型数据
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="inDto"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public async Task<GetTrialFileTypeDataOutDto> GetTrialFileTypeData(GetTrialFileTypeDataInDto inDto)
|
|
||||||
{
|
|
||||||
|
|
||||||
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,7 +100,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
CreateMap<SysFileType, SysFileTypeAddOrEdit>().ReverseMap();
|
CreateMap<SysFileType, SysFileTypeAddOrEdit>().ReverseMap();
|
||||||
|
|
||||||
CreateMap<TrialFileType, TrialFileTypeView>();
|
CreateMap<TrialFileType, TrialFileTypeView>();
|
||||||
|
|
||||||
CreateMap<TrialFileType, TrialFileTypeAddOrEdit>().ReverseMap();
|
CreateMap<TrialFileType, TrialFileTypeAddOrEdit>().ReverseMap();
|
||||||
|
|
||||||
CreateMap<TrialFinalRecord, TrialFinalRecordView>();
|
CreateMap<TrialFinalRecord, TrialFinalRecordView>();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue