Merge branch 'Test_IRC_Net10' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net10
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
cdccd6f238
|
|
@ -14,7 +14,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
[NotDefault]
|
[NotDefault]
|
||||||
public Guid TrialReadingCriterionId { get; set; }
|
public Guid TrialReadingCriterionId { get; set; }
|
||||||
|
|
||||||
[NotDefault]
|
|
||||||
public decimal VisitNum { get; set; }
|
public decimal VisitNum { get; set; }
|
||||||
|
|
||||||
public Guid? ReadingQuestionId { get; set; }
|
public Guid? ReadingQuestionId { get; set; }
|
||||||
|
|
@ -25,7 +24,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
[NotDefault]
|
[NotDefault]
|
||||||
public Guid TrialReadingCriterionId { get; set; }
|
public Guid TrialReadingCriterionId { get; set; }
|
||||||
|
|
||||||
[NotDefault]
|
|
||||||
public decimal VisitNum { get; set; }
|
public decimal VisitNum { get; set; }
|
||||||
|
|
||||||
public List<TrialQuestionVisitJudgeRuleItemDto> QuestionList { get; set; } = new List<TrialQuestionVisitJudgeRuleItemDto>();
|
public List<TrialQuestionVisitJudgeRuleItemDto> QuestionList { get; set; } = new List<TrialQuestionVisitJudgeRuleItemDto>();
|
||||||
|
|
@ -820,6 +818,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// 裁判任务生成
|
/// 裁判任务生成
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public JudgeGenerate JudgeGenerateEnum { get; set; } = JudgeGenerate.Instant;
|
public JudgeGenerate JudgeGenerateEnum { get; set; } = JudgeGenerate.Instant;
|
||||||
|
|
||||||
|
public bool IsSigned { get; set; } = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum NeedSynchronize
|
public enum NeedSynchronize
|
||||||
|
|
|
||||||
|
|
@ -374,7 +374,7 @@ namespace IRaCIS.Core.Application.Service.RC
|
||||||
JudgeModeEnum = x.JudgeModeEnum,
|
JudgeModeEnum = x.JudgeModeEnum,
|
||||||
JudgeRuleEnum = x.JudgeRuleEnum,
|
JudgeRuleEnum = x.JudgeRuleEnum,
|
||||||
JudgeGenerateEnum = x.JudgeGenerateEnum,
|
JudgeGenerateEnum = x.JudgeGenerateEnum,
|
||||||
|
IsSigned = x.IsSigned,
|
||||||
}).FirstNotNullAsync();
|
}).FirstNotNullAsync();
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms;
|
||||||
using IRaCIS.Core.Application.Contracts;
|
using IRaCIS.Core.Application.Contracts;
|
||||||
using IRaCIS.Core.Application.Service.Reading.Dto;
|
using IRaCIS.Core.Application.Service.Reading.Dto;
|
||||||
using IRaCIS.Core.Domain.Share;
|
using IRaCIS.Core.Domain.Share;
|
||||||
|
|
@ -58,6 +59,12 @@ namespace IRaCIS.Core.Application.Service
|
||||||
ReadingQuestionTrialId = x.Id,
|
ReadingQuestionTrialId = x.Id,
|
||||||
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
|
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
|
||||||
ShowOrder = x.ShowOrder,
|
ShowOrder = x.ShowOrder,
|
||||||
|
Type = x.Type,
|
||||||
|
TypeValue = x.TypeValue,
|
||||||
|
QuestionGenre = x.QuestionGenre,
|
||||||
|
DictionaryCode = x.DictionaryCode,
|
||||||
|
Unit = x.Unit,
|
||||||
|
CustomUnit = x.CustomUnit,
|
||||||
})
|
})
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue