Compare commits

..

No commits in common. "3c491923603389d494ec8eb49afef2d1c412f118" and "09405dea8bcc68fad2f737d3d08f9289e94fe4ad" have entirely different histories.

7 changed files with 0 additions and 18133 deletions

View File

@ -458,30 +458,7 @@ 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>
@ -590,31 +567,6 @@ 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>();

View File

@ -408,8 +408,6 @@ 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());
@ -748,7 +746,6 @@ 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()

View File

@ -142,30 +142,5 @@ 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>();
}
}
}
}

View File

@ -154,29 +154,4 @@ 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>();
}
}
}
}

View File

@ -1,66 +0,0 @@
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");
}
}
}

View File

@ -6346,16 +6346,6 @@ 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)")
@ -6543,16 +6533,6 @@ 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)