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
2022-04-27 13:10:39 +08:00
parent d54193031e
commit 9180fd38df
8 changed files with 59 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Infra.EFCore/Repository/IRepository.cs
+2 -2
View File
@@ -59,7 +59,7 @@ namespace IRaCIS.Core.Infra.EFCore
/// <param name="ForeignKeyText">要查询的外键值</param>
/// <param name="value">传入的纸</param>
/// <returns></returns>
Task<string> GetDictionaryValue(string Identification, string json);
Task<string> GetInspectionEnumValue(string Identification, string json);
/// <summary>
@@ -67,7 +67,7 @@ namespace IRaCIS.Core.Infra.EFCore
/// </summary>
/// <param name="dto">传入Dto</param>
/// <returns></returns>
Task<List<string>> SetDictionaryValue(SetDictionaryValueDto dto);
Task<List<string>> SetInspectionEnumValue(SetInspectionEnumValueDto dto);
}
IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
+13 -9
View File
@@ -569,12 +569,11 @@ namespace IRaCIS.Core.Infra.EFCore
/// </summary>
/// <param name="dto">传入Dto</param>
/// <returns></returns>
public async Task<List<string>> SetDictionaryValue(SetDictionaryValueDto dto)
public async Task<List<string>> SetInspectionEnumValue(SetInspectionEnumValueDto dto)
{
foreach (var item in dto.Items)
{
item.Json = await GetDictionaryValue(item.Identification,item.Json);
item.Json = await GetInspectionEnumValue(item.Identification,item.Json);
item.Json = await SetEnum(dto.TrialId, item.Identification, item.Json);
}
@@ -590,9 +589,9 @@ namespace IRaCIS.Core.Infra.EFCore
/// <param name="ForeignKeyText">要查询的外键值</param>
/// <param name="value">传入的纸</param>
/// <returns></returns>
public async Task<string> GetDictionaryValue(string Identification, string json)
public async Task<string> GetInspectionEnumValue(string identification, string json)
{
var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == Identification)
var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == identification)
join p in _dbContext.FrontAuditConfig.Where(x => x.EnumType == "Foreign") on u.Id equals p.ParentId
select new
{
@@ -645,9 +644,9 @@ namespace IRaCIS.Core.Infra.EFCore
/// <param name="json">Json对象</param>
/// <returns></returns>
/// <exception cref="BusinessValidationFailedException"></exception>
public async Task<string> SetEnum(Guid trilaid, string Identification, string json)
public async Task<string> SetEnum(Guid trilaid, string identification, string json)
{
var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == Identification)
var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == identification)
join p in _dbContext.FrontAuditConfig.Where(x => x.Code != "AuditState" && (x.DictionaryCode != null && x.DictionaryCode != string.Empty && x.DictionaryType != null && x.DictionaryType != string.Empty)) on u.Id equals p.ParentId
select new
{
@@ -767,6 +766,12 @@ namespace IRaCIS.Core.Infra.EFCore
}
/// <summary>
/// 添加稽查记录
/// </summary>
/// <param name="entity">实体</param>
/// <param name="isSaveAudit"></param>
/// <returns></returns>
private async Task AddInspectionAsync(TEntity entity, bool isSaveAudit = false)
{
List<DataInspection> datas = new List<DataInspection>();
@@ -800,7 +805,6 @@ namespace IRaCIS.Core.Infra.EFCore
SiteId = data.SiteId,
SubjectId = data.Id,
SubjectCode = data.Code,
IsSign = false,
CreateTime = createtime,
Identification = "Init|Subject|Status|Subject", // 初始化受试者信息
@@ -935,7 +939,7 @@ namespace IRaCIS.Core.Infra.EFCore
/// <summary>
/// 格式化日期和时间
/// </summary>
/// <param name="Data"></param>
/// <param name="Data">稽查数据</param>
/// <returns></returns>
public async Task<DataInspection> SetDataInspectionDateType(DataInspection Data)
{