翻译稽查数据
parent
2e743448f7
commit
f96ce12758
|
@ -719,6 +719,9 @@ namespace IRaCIS.Core.Application.Service
|
||||||
Type = p.DictionaryType
|
Type = p.DictionaryType
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
|
||||||
|
//两条不同的标识 但是里面配置有相同的翻译字典
|
||||||
|
list=list.Distinct().ToList();
|
||||||
|
|
||||||
// 添加单双审
|
// 添加单双审
|
||||||
var trialtype = await _trialRepository.AsQueryable().Where(x => x.Id == trialId).Select(x => x.QCProcessEnum).FirstOrDefaultAsync();
|
var trialtype = await _trialRepository.AsQueryable().Where(x => x.Id == trialId).Select(x => x.QCProcessEnum).FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
@ -731,20 +734,9 @@ namespace IRaCIS.Core.Application.Service
|
||||||
Key = "AuditState",
|
Key = "AuditState",
|
||||||
Code = trialtype == TrialQCProcess.SingleAudit ? "AuditStatePE" : "AuditStateRC",
|
Code = trialtype == TrialQCProcess.SingleAudit ? "AuditStatePE" : "AuditStateRC",
|
||||||
Type = "Code",
|
Type = "Code",
|
||||||
}); ;
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
list = list.GroupBy(x => new { x.Key }, (key, lst) => new
|
|
||||||
{
|
|
||||||
DataType = lst.Max(x => x.DataType),
|
|
||||||
TableConfigJsonStr = lst.Max(x => x.TableConfigJsonStr),
|
|
||||||
Key = key.Key,
|
|
||||||
Code = lst.Max(x => x.Code),
|
|
||||||
Type = lst.Max(x => x.Type),
|
|
||||||
|
|
||||||
}).ToList();
|
|
||||||
|
|
||||||
var jsonDataDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(jsonStr);
|
var jsonDataDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(jsonStr);
|
||||||
foreach (var item in list)
|
foreach (var item in list)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue