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

修改

Browse Source
This commit is contained in:
he
2024-10-15 10:29:31 +08:00
parent 2208e1dbe5
commit cb4296396f
4 changed files with 96 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+53 -14
View File
@@ -1,5 +1,7 @@
using IRaCIS.Core.Domain.Share;
using Newtonsoft.Json;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Application.Service.Reading.Dto
{
@@ -850,10 +852,27 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ExportIdentification? ExportIdentification { get; set; }
/// <summary>
/// 导出结果
/// </summary>
public ExportResult? ExportResult { 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>
/// 分组
@@ -1124,8 +1143,25 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
[Comment("导出标识")]
public ExportIdentification? ExportIdentification { get; set; }
[Comment("导出结果")]
public ExportResult? ExportResult { get; set; }
public string ExportResultStr { get; set; } = "[]";
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>
/// 数值类型
@@ -1673,10 +1709,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ExportIdentification? ExportIdentification { get; set; }
/// <summary>
/// 导出结果
/// </summary>
public ExportResult? ExportResult { get; set; }
[Comment("导出结果")]
public string ExportResultStr { get; set; } = "[]";
public List<ExportResult> ExportResult { get; set; } = new List<ExportResult>();
/// <summary>
/// 数值类型
@@ -1901,10 +1938,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ExportIdentification? ExportIdentification { get; set; }
/// <summary>
/// 导出结果
/// </summary>
public ExportResult? ExportResult { get; set; }
[Comment("导出结果")]
public string ExportResultStr { get; set; } = "[]";
public List<ExportResult> ExportResult { get; set; } = new List<ExportResult>();
public bool IsAdditional { get; set; }