From 359aefe7f9aa8feff715deb5a619a2cf4ea31e4a Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 1 Dec 2022 17:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Reading/Dto/ReadingQuestionViewModel.cs | 5 +++++
.../Reading/ReadingCriterion/ReadingQuestionService.cs | 2 ++
2 files changed, 7 insertions(+)
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 64a16ceec..edf510dcb 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -1054,6 +1054,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{
public Guid QuestionId { get; set; }
+ ///
+ /// 自定义计算标记
+ ///
+ public CustomCalculateMark? CustomCalculateMark { get; set; }
+
public List CalculateQuestionList { get; set; }
}
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
index 675cde700..71cc026e0 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
@@ -480,6 +480,7 @@ namespace IRaCIS.Application.Services
.Select(x => new CalculateRelationDto()
{
QuestionId = x.Id,
+ CustomCalculateMark=x.CustomCalculateMark,
CalculateQuestionList = x.CalculateQuestionList
}).ToListAsync();
@@ -490,6 +491,7 @@ namespace IRaCIS.Application.Services
.Select(x => new CalculateRelationDto()
{
QuestionId = x.Id,
+ CustomCalculateMark = x.CustomCalculateMark,
CalculateQuestionList = x.CalculateQuestionList
}).ToListAsync();