稽查外层问题修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
364ce9aefb
commit
549691c8ac
|
@ -3310,6 +3310,17 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
markName = mark.OrderMarkName;
|
markName = mark.OrderMarkName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 这里本来就批量展示问题的 现在又需要单个展示
|
||||||
|
var thisQuestinonAnswer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(x => x.Entity as ReadingTaskQuestionAnswer).FirstOrDefault();
|
||||||
|
|
||||||
|
string questionName = string.Empty;
|
||||||
|
string questionAnswer = string.Empty;
|
||||||
|
if (thisQuestinonAnswer != null)
|
||||||
|
{
|
||||||
|
questionName = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == thisQuestinonAnswer.ReadingQuestionTrialId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefaultAsync();
|
||||||
|
questionAnswer = thisQuestinonAnswer.Answer;
|
||||||
|
}
|
||||||
|
|
||||||
await InsertInspection<ReadingTaskQuestionAnswer>(cloneEntity, type, x => new InspectionConvertDTO()
|
await InsertInspection<ReadingTaskQuestionAnswer>(cloneEntity, type, x => new InspectionConvertDTO()
|
||||||
{
|
{
|
||||||
VisitTaskId = x.VisitTaskId,
|
VisitTaskId = x.VisitTaskId,
|
||||||
|
@ -3327,6 +3338,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
MarkName = markName,
|
MarkName = markName,
|
||||||
PicturePath = mark != null ? mark.PicturePath : string.Empty,
|
PicturePath = mark != null ? mark.PicturePath : string.Empty,
|
||||||
|
QuestinonAnswer = questionAnswer,
|
||||||
|
QuestionName = questionName,
|
||||||
QuestionAnswerList = taskQuestionAnswerList.Join(quesionList,
|
QuestionAnswerList = taskQuestionAnswerList.Join(quesionList,
|
||||||
t => t.ReadingQuestionTrialId,
|
t => t.ReadingQuestionTrialId,
|
||||||
u => u.QuestionId,
|
u => u.QuestionId,
|
||||||
|
|
Loading…
Reference in New Issue