XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

IRC_NewDev
he 2024-10-24 09:24:45 +08:00
parent 9385e22c58
commit 2a853e49f6
6 changed files with 18090 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -9287,6 +9287,11 @@
表格问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.ClassifyType">
<summary>
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.CustomCalculateMark">
<summary>
自定义计算标记
@ -9400,6 +9405,11 @@
数值类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.ClassifyType">
<summary>
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.QuestionClassify">
<summary>
问题分类
@ -9828,11 +9838,21 @@
问题英文分组
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ClassifyType">
<summary>
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ExportIdentification">
<summary>
导出标识
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ClassifyType">
<summary>
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ClassifyAlgorithms">
<summary>
分类算法
@ -10208,6 +10228,11 @@
图片数量
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ClassifyType">
<summary>
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ExportIdentification">
<summary>
导出标识
@ -10423,6 +10448,11 @@
Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ClassifyType">
<summary>
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ExportIdentification">
<summary>
导出标识

8
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -1620,7 +1620,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid SystemCriterionId { get; set; }
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
public List<string> TypeList { get; set; } = new List<string>();
}
@ -1630,7 +1634,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid TrialCriterionId { get; set; }
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
public List<string> TypeList { get; set; } = new List<string>();

3
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
View File

@ -138,7 +138,8 @@ namespace IRaCIS.Core.Application.Service
var result = await _readingQuestionSystemRepository
.Where(x => x.ReadingQuestionCriterionSystemId == inDto.SystemCriterionId)
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
.WhereIf(inDto.TypeList.Count() > 0, x => inDto.TypeList.Contains(x.Type))
.OrderBy(x => x.ShowOrder)
.Select(x => new GetCalculateQuestionsOutDto
()

17974
IRaCIS.Core.Infra.EFCore/Migrations/20241024011550_question202410240915.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

62
IRaCIS.Core.Infra.EFCore/Migrations/20241024011550_question202410240915.cs Normal file
View File

@ -0,0 +1,62 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class question202410240915 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "ClassifyType",
table: "ReadingTableQuestionTrial",
type: "int",
nullable: true,
comment: "分类类型");
migrationBuilder.AddColumn<int>(
name: "ClassifyType",
table: "ReadingTableQuestionSystem",
type: "int",
nullable: true,
comment: "分类类型");
migrationBuilder.AddColumn<int>(
name: "ClassifyType",
table: "ReadingQuestionTrial",
type: "int",
nullable: true,
comment: "分类类型");
migrationBuilder.AddColumn<int>(
name: "ClassifyType",
table: "ReadingQuestionSystem",
type: "int",
nullable: true,
comment: "分类类型");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ClassifyType",
table: "ReadingTableQuestionTrial");
migrationBuilder.DropColumn(
name: "ClassifyType",
table: "ReadingTableQuestionSystem");
migrationBuilder.DropColumn(
name: "ClassifyType",
table: "ReadingQuestionTrial");
migrationBuilder.DropColumn(
name: "ClassifyType",
table: "ReadingQuestionSystem");
}
}
}

16
IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
View File

@ -5479,6 +5479,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("uniqueidentifier")
.HasComment("分类问题Id");
b.Property<int?>("ClassifyType")
.HasColumnType("int")
.HasComment("分类类型");
b.Property<int>("ConvertShowType")
.HasColumnType("int")
.HasComment("转化显示类型");
@ -5729,6 +5733,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("uniqueidentifier")
.HasComment("分类问题Id");
b.Property<int?>("ClassifyType")
.HasColumnType("int")
.HasComment("分类类型");
b.Property<int>("ConvertShowType")
.HasColumnType("int")
.HasComment("转化显示类型");
@ -6318,6 +6326,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("uniqueidentifier")
.HasComment("分类问题表格Id");
b.Property<int?>("ClassifyType")
.HasColumnType("int")
.HasComment("分类类型");
b.Property<DateTime>("CreateTime")
.HasColumnType("datetime2");
@ -6512,6 +6524,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("uniqueidentifier")
.HasComment("分类问题表格Id");
b.Property<int?>("ClassifyType")
.HasColumnType("int")
.HasComment("分类类型");
b.Property<DateTime>("CreateTime")
.HasColumnType("datetime2");