From 61278375badc4baa6dfac6d115635381989ddcbe Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 23 Oct 2024 17:05:27 +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 --- .../Reading/Dto/ReadingQuestionViewModel.cs | 32 ++++++++++++++++++- IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 18 +++++++++++ .../ReadingQuestionSystem.cs | 3 ++ .../ReadingQuestionTrial.cs | 5 +++ .../ReadingTableQuestionSystem.cs | 3 ++ .../ReadingTableQuestionTrial.cs | 3 ++ 6 files changed, 63 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 6487a69f8..9301685d3 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -322,6 +322,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid? ClassifyTableQuestionId { get; set; } + /// + /// 分类问题类型 + /// + public ClassifyType? ClassifyType { get; set; } + + + public string ClassifyAlgorithms { get; set; } = string.Empty; @@ -484,6 +491,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid? ClassifyTableQuestionId { get; set; } + /// + /// 分类问题类型 + /// + public ClassifyType? ClassifyType { get; set; } + public string ClassifyAlgorithms { get; set; } = string.Empty; /// @@ -1150,6 +1162,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string GroupEnName { get; set; } = string.Empty; + + /// + /// 分类问题类型 + /// + public ClassifyType? ClassifyType { get; set; } public List ParentTriggerValueList { get; set; } = new List(); public List RelevanceValueList { get; set; } = new List(); public List CalculateQuestionList { get; set; } @@ -1165,6 +1182,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto [Comment("导出标识")] public ExportIdentification? ExportIdentification { get; set; } + /// + /// 分类问题类型 + /// + public ClassifyType? ClassifyType { get; set; } + /// /// 分类算法 /// @@ -1748,7 +1770,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class AddOrUpdateReadingQuestionSystemInDto { - + /// + /// 分类问题类型 + /// + public ClassifyType? ClassifyType { get; set; } /// /// 导出标识 @@ -1991,6 +2016,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid? Id { get; set; } + /// + /// 分类问题类型 + /// + public ClassifyType? ClassifyType { get; set; } + /// /// 导出标识 /// diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index cdaf1ce05..ecc113c31 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -357,6 +357,24 @@ namespace IRaCIS.Core.Domain.Share Automatic = 1 } + + /// + /// 分类算法的类型 + /// + public enum ClassifyType + { + /// + /// 数值 + /// + NumericalValue = 0, + + /// + /// 下拉框 + /// + Dropdown = 1, + + } + /// /// 问题分类 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index 9d9ab5d3a..a27dae89d 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -185,6 +185,9 @@ public class ReadingQuestionSystem : BaseAddAuditEntity [Comment("分组分类")] public GroupClassify? GroupClassify { get; set; } + [Comment("分类类型")] + public ClassifyType? ClassifyType { get; set; } + [Comment("问题分类")] public QuestionClassify? QuestionClassify { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index ddbb78ff9..2309185a6 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -232,6 +232,8 @@ public class ReadingQuestionTrial : BaseAddAuditEntity [Comment("数据来源")] public DataSources DataSource { get; set; } = DataSources.ManualEntry; + + [Comment("问题英文名称")] public string QuestionEnName { get; set; } = string.Empty; @@ -241,6 +243,9 @@ public class ReadingQuestionTrial : BaseAddAuditEntity [Comment("分类算法")] public string ClassifyAlgorithms { get; set; } = string.Empty; + [Comment("分类类型")] + public ClassifyType? ClassifyType { get; set; } + [Comment("分类问题Id")] public Guid? ClassifyQuestionId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index cc3f3cb18..9ccfca6c8 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -142,6 +142,9 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity [Comment("分类问题表格Id")] public Guid? ClassifyTableQuestionId { get; set; } + [Comment("分类类型")] + public ClassifyType? ClassifyType { get; set; } + [Comment("分类算法")] public string ClassifyAlgorithms { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index 03fa0d37f..82f3b11d9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -158,6 +158,9 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity [Comment("分类问题表格Id")] public Guid? ClassifyTableQuestionId { get; set; } + [Comment("分类类型")] + public ClassifyType? ClassifyType { get; set; } + [Comment("导出标识")] public ExportIdentification? ExportIdentification { get; set; }