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

修改

IRC_NewDev
he 2024-10-22 16:47:48 +08:00
parent f7a3e87ba8
commit c610c3bac0
7 changed files with 18133 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -458,7 +458,30 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public List<string> ParentTriggerValueList { get; set; } = new List<string>();
public List<string> RelevanceValueList { get; set; } = new List<string>();
[Comment("导出标识")]
public ExportIdentification? ExportIdentification { get; set; }
[Comment("导出结果")]
public string ExportResultStr { get; set; } = "[]";
[NotMapped]
public List<ExportResult> ExportResult
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
return result == null ? new List<ExportResult>() : result;
}
catch (Exception)
{
return new List<ExportResult>();
}
}
}
}
///<summary> ReadingTableQuestionSystemAddOrEdit 列表查询参数模型</summary>
@ -567,6 +590,31 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
[Comment("导出标识")]
public ExportIdentification? ExportIdentification { get; set; }
[Comment("导出结果")]
public string ExportResultStr { get; set; } = "[]";
[NotMapped]
public List<ExportResult> ExportResult
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
return result == null ? new List<ExportResult>() : result;
}
catch (Exception)
{
return new List<ExportResult>();
}
}
}
public List<string> ParentTriggerValueList { get; set; } = new List<string>();
public List<string> RelevanceValueList { get; set; } = new List<string>();

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

@ -408,6 +408,8 @@ namespace IRaCIS.Core.Application.Service
{
indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
indto.ExportResultStr = JsonConvert.SerializeObject(indto.ExportResult);
var entity = await _readingTableQuestionSystemRepository.InsertOrUpdateAsync(indto, true);
return ResponseOutput.Ok(entity.Id.ToString());
@ -746,6 +748,7 @@ namespace IRaCIS.Core.Application.Service
indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
indto.ExportResultStr = JsonConvert.SerializeObject(indto.ExportResult);
if (indto.Id != null)
{
var relationList = await GetQuestionCalculateRelation(new GetQuestionCalculateRelationInDto()

25
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs
View File

@ -142,5 +142,30 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity
[Comment("分类算法")]
public string ClassifyAlgorithms { get; set; } = string.Empty;
[Comment("导出标识")]
public ExportIdentification? ExportIdentification { get; set; }
[Comment("导出结果")]
public string ExportResultStr { get; set; } = "[]";
[NotMapped]
public List<ExportResult> ExportResult
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
return result == null ? new List<ExportResult>() : result;
}
catch (Exception)
{
return new List<ExportResult>();
}
}
}
}

25
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
View File

@ -154,4 +154,29 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity
[Comment("分类问题表格Id")]
public Guid? ClassifyTableQuestionId { get; set; }
[Comment("导出标识")]
public ExportIdentification? ExportIdentification { get; set; }
[Comment("导出结果")]
public string ExportResultStr { get; set; } = "[]";
[NotMapped]
public List<ExportResult> ExportResult
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
return result == null ? new List<ExportResult>() : result;
}
catch (Exception)
{
return new List<ExportResult>();
}
}
}
}

17946
IRaCIS.Core.Infra.EFCore/Migrations/20241022084419_tablequestion10221643.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

66
IRaCIS.Core.Infra.EFCore/Migrations/20241022084419_tablequestion10221643.cs Normal file
View File

@ -0,0 +1,66 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class tablequestion10221643 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "ExportIdentification",
table: "ReadingTableQuestionTrial",
type: "int",
nullable: true,
comment: "导出标识");
migrationBuilder.AddColumn<string>(
name: "ExportResultStr",
table: "ReadingTableQuestionTrial",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "[]",
comment: "导出结果");
migrationBuilder.AddColumn<int>(
name: "ExportIdentification",
table: "ReadingTableQuestionSystem",
type: "int",
nullable: true,
comment: "导出标识");
migrationBuilder.AddColumn<string>(
name: "ExportResultStr",
table: "ReadingTableQuestionSystem",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "[]",
comment: "导出结果");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ExportIdentification",
table: "ReadingTableQuestionTrial");
migrationBuilder.DropColumn(
name: "ExportResultStr",
table: "ReadingTableQuestionTrial");
migrationBuilder.DropColumn(
name: "ExportIdentification",
table: "ReadingTableQuestionSystem");
migrationBuilder.DropColumn(
name: "ExportResultStr",
table: "ReadingTableQuestionSystem");
}
}
}

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

@ -6346,6 +6346,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("nvarchar(400)")
.HasComment("字典code");
b.Property<int?>("ExportIdentification")
.HasColumnType("int")
.HasComment("导出标识");
b.Property<string>("ExportResultStr")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)")
.HasComment("导出结果");
b.Property<string>("FileType")
.HasMaxLength(400)
.HasColumnType("nvarchar(400)")
@ -6533,6 +6543,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("nvarchar(400)")
.HasComment("字典code");
b.Property<int?>("ExportIdentification")
.HasColumnType("int")
.HasComment("导出标识");
b.Property<string>("ExportResultStr")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)")
.HasComment("导出结果");
b.Property<string>("FileType")
.IsRequired()
.HasMaxLength(400)