表格问题标记稽查修改
parent
c84753f99d
commit
d0f0b5046c
|
@ -3300,8 +3300,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var mark = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionMark)).Select(x => x.Entity as ReadingTaskQuestionMark).FirstOrDefault();
|
var markList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionMark)).Select(x => x.Entity as ReadingTaskQuestionMark).ToList();
|
||||||
|
|
||||||
|
var questionids = taskQuestionAnswerList.Select(x => x.ReadingQuestionTrialId as Guid?).ToList();
|
||||||
|
var mark= markList.Where(x=> questionids.Contains(x.QuestionId)).FirstOrDefault();
|
||||||
var markName = string.Empty;
|
var markName = string.Empty;
|
||||||
if (mark != null)
|
if (mark != null)
|
||||||
{
|
{
|
||||||
|
@ -3363,6 +3365,18 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
var generalId = IdentifierHelper.CreateGuid(entity.VisitTaskId.ToString(), entity.QuestionId.ToString(), entity.RowId.ToString(), entity.TableQuestionId.ToString(), "ReadingTableQuestionAnswer");
|
var generalId = IdentifierHelper.CreateGuid(entity.VisitTaskId.ToString(), entity.QuestionId.ToString(), entity.RowId.ToString(), entity.TableQuestionId.ToString(), "ReadingTableQuestionAnswer");
|
||||||
var rowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefaultAsync();
|
var rowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
|
||||||
|
var markList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionMark)).Select(x => x.Entity as ReadingTaskQuestionMark).ToList();
|
||||||
|
|
||||||
|
|
||||||
|
var mark = markList.Where(x => x.RowId== entity.RowId&&x.TableQuestionId==entity.TableQuestionId).FirstOrDefault();
|
||||||
|
var markName = string.Empty;
|
||||||
|
if (mark != null)
|
||||||
|
{
|
||||||
|
markName = mark.OrderMarkName;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
await InsertInspection<ReadingTableQuestionAnswer>(entity, type, x => new InspectionConvertDTO()
|
await InsertInspection<ReadingTableQuestionAnswer>(entity, type, x => new InspectionConvertDTO()
|
||||||
{
|
{
|
||||||
VisitTaskId = entity.VisitTaskId,
|
VisitTaskId = entity.VisitTaskId,
|
||||||
|
@ -3372,6 +3386,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
}, new
|
}, new
|
||||||
{
|
{
|
||||||
|
MarkName = markName,
|
||||||
|
PicturePath = mark != null ? mark.PicturePath : string.Empty,
|
||||||
QuestionName = questionName,
|
QuestionName = questionName,
|
||||||
RowMark = rowMark,
|
RowMark = rowMark,
|
||||||
TableQuestionName = tableQuestionName,
|
TableQuestionName = tableQuestionName,
|
||||||
|
|
Loading…
Reference in New Issue