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

修改一版

Uat_Study
he 2022-07-13 15:27:26 +08:00
parent edf85de710
commit 491b0a4d7d
3 changed files with 110 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -3854,31 +3854,6 @@
仲裁规则/对象
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.DigitPlaces">
<summary>
修约小数点
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialCriterionId">
<summary>
项目标准Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingCriterionPageList">
<summary>
项目分页
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialJudgeQuestionList">
<summary>
项目裁判问题集合
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialQuestionList">
<summary>
项目问题集合
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.Id">
<summary>
pageId
@ -4009,6 +3984,26 @@
标准
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.DigitPlaces">
<summary>
修约小数点
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.TrialCriterionId">
<summary>
项目标准Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.ReadingCriterionPageList">
<summary>
项目分页
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.TrialQuestionList">
<summary>
项目问题集合
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingCriterionInDto.FormType">
<summary>
表单类型
@ -4642,6 +4637,20 @@
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.TrialConfigService.GetTrialReadingJudgeList(IRaCIS.Core.Application.Contracts.GetTrialReadingInfoInDto)">
<summary>
获取项目裁判信息
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.TrialConfigService.GetTrialReadingCriterionInfo(IRaCIS.Core.Application.Contracts.GetTrialReadingInfoInDto)">
<summary>
获取项目阅片标准信息
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.TrialConfigService.SetTrialReadingCriterion(IRaCIS.Core.Application.Contracts.SetTrialReadingCriterionInDto)">
<summary>
设置项目阅片标准

48
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -327,16 +327,7 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary>
public int ArbitrationRule { get; set; } = 2;
/// <summary>
/// 修约小数点
/// </summary>
public int? DigitPlaces { get; set; }
public FormType? FormType { get; set; }
/// <summary>
/// 项目标准Id
/// </summary>
public Guid? TrialCriterionId { get; set; }
///// <summary>
///// 全局阅片
@ -370,21 +361,9 @@ namespace IRaCIS.Core.Application.Contracts
/// <summary>
/// 项目分页
/// </summary>
public List<ReadingCriterionPageDto> ReadingCriterionPageList { get; set; }
/// <summary>
/// 项目裁判问题集合
/// </summary>
public List<TrialJudgeQuestion> TrialJudgeQuestionList { get; set; }
/// <summary>
/// 项目问题集合
/// </summary>
public List<TrialReadQuestion> TrialQuestionList { get; set; }
}
public class ReadingCriterionPageDto
@ -546,6 +525,31 @@ namespace IRaCIS.Core.Application.Contracts
public Guid TrialId { get; set; }
}
public class GetTrialReadingCriterionInfoOutDto
{
/// <summary>
/// 修约小数点
/// </summary>
public int? DigitPlaces { get; set; }
public FormType? FormType { get; set; }
/// <summary>
/// 项目标准Id
/// </summary>
public Guid? TrialCriterionId { get; set; }
/// <summary>
/// 项目分页
/// </summary>
public List<ReadingCriterionPageDto> ReadingCriterionPageList { get; set; }
/// <summary>
/// 项目问题集合
/// </summary>
public List<TrialReadQuestion> TrialQuestionList { get; set; }
}
public class GetTrialReadingInfoInDto
{

52
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -73,19 +73,19 @@ namespace IRaCIS.Core.Application
public async Task<GetTrialReadingInfoOutDto> GetTrialReadingInfo(GetTrialReadingInfoInDto inDto)
{
GetTrialReadingInfoOutDto trialInfo= await _trialRepository.Where(x=>x.Id==inDto.TrialId).ProjectTo<GetTrialReadingInfoOutDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
trialInfo.DigitPlaces = null;
trialInfo.ReadingCriterionPageList = await _readingCriterionPageRepository.Where(x => x.TrialId == inDto.TrialId).ProjectTo<ReadingCriterionPageDto>(_mapper.ConfigurationProvider).ToListAsync();
return trialInfo;
}
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
if (trialCriterion != null)
/// <summary>
/// 获取项目裁判信息
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<TrialJudgeQuestion>> GetTrialReadingJudgeList(GetTrialReadingInfoInDto inDto)
{
trialInfo.DigitPlaces= trialCriterion.DigitPlaces;
trialInfo.TrialCriterionId = trialCriterion.Id;
trialInfo.FormType = trialCriterion.FormType;
};
trialInfo.TrialJudgeQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.IsJudgeQuestion && x.TrialId == inDto.TrialId)
return await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.IsJudgeQuestion && x.TrialId == inDto.TrialId)
.Select(x => new TrialJudgeQuestion()
{
AnswerCombination = x.AnswerCombination,
@ -95,12 +95,36 @@ namespace IRaCIS.Core.Application
QuestionName = x.QuestionName,
ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId
}).ToListAsync();
trialInfo.TrialQuestionList= await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm&&x.TrialId==inDto.TrialId)
.ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).ToListAsync();
return trialInfo;
}
/// <summary>
/// 获取项目阅片标准信息
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<GetTrialReadingCriterionInfoOutDto> GetTrialReadingCriterionInfo(GetTrialReadingInfoInDto inDto)
{
GetTrialReadingCriterionInfoOutDto result = new GetTrialReadingCriterionInfoOutDto();
result.ReadingCriterionPageList = await _readingCriterionPageRepository.Where(x => x.TrialId == inDto.TrialId).ProjectTo<ReadingCriterionPageDto>(_mapper.ConfigurationProvider).ToListAsync();
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
if (trialCriterion != null)
{
result.DigitPlaces = trialCriterion.DigitPlaces;
result.TrialCriterionId = trialCriterion.Id;
result.FormType = trialCriterion.FormType;
};
result.TrialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.TrialId == inDto.TrialId)
.ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).ToListAsync();
return result;
}
/// <summary>
/// 设置项目阅片标准