Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api
commit
79e556ac80
|
@ -584,7 +584,7 @@ namespace IRaCIS.Core.Application.Service.RC
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return await _readingTrialCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.SystemCriterionId
|
return await _readingTrialCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.TrialCriterionId
|
||||||
)
|
)
|
||||||
.WhereIf(!inDto.ParentCode.IsNullOrEmpty(), x => x.ParentCode == inDto.ParentCode)
|
.WhereIf(!inDto.ParentCode.IsNullOrEmpty(), x => x.ParentCode == inDto.ParentCode)
|
||||||
.ProjectTo<CriterionDictionaryInfo>(_mapper.ConfigurationProvider).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync();
|
.ProjectTo<CriterionDictionaryInfo>(_mapper.ConfigurationProvider).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync();
|
||||||
|
|
|
@ -849,7 +849,7 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
public CriterionType CriterionType { get; set; }
|
public CriterionType CriterionType { get; set; }
|
||||||
|
|
||||||
//自动 手动生成任务
|
//自动 手动生成任务
|
||||||
public bool IsAutoCreate { get; set; }
|
public bool IsAutoCreate { get; set; } = true;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 项目标准ID
|
/// 项目标准ID
|
||||||
|
|
Loading…
Reference in New Issue