diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
index be2d73e10..0b6af178a 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
@@ -48,27 +48,38 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid Id { get; set; }
}
+ ///
+ /// 完全复制对象
+ ///
public class FullyReplicated
{
///
/// 数据来源对象
///
- public Guid DataFromItem { get; set; }
+ public Guid DataFromItemGuid { get; set; }
///
/// 要赋值到的对象
///
- public Guid ThisTiem { get; set; }
+ public Guid ThisItemGuid { get; set; }
}
-
+ ///
+ /// 复制其他对象到当前对象
+ ///
public class CopyOtherToThisItem
{
- public List DataSource { get; set; }=new List(){ };
+ ///
+ /// 数据源Guids
+ ///
+ public List DataSourceGuids { get; set; }=new List(){ };
- public Guid AddItem { get; set; }
+ ///
+ /// 添加对象的Guid
+ ///
+ public Guid AddItemGuid { get; set; }
}
public class GetDescriptionByModuleTypeDto
diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
index 596115f05..4c6f62376 100644
--- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
@@ -571,12 +571,12 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task FullyReplicated(FullyReplicated fully)
{
- await _frontAuditConfigRepository.DeleteFromQueryAsync(x => x.ParentId == fully.ThisTiem);
- var list = await _frontAuditConfigRepository.Where(x => x.ParentId == fully.DataFromItem).ToListAsync();
+ await _frontAuditConfigRepository.DeleteFromQueryAsync(x => x.ParentId == fully.ThisItemGuid);
+ var list = await _frontAuditConfigRepository.Where(x => x.ParentId == fully.DataFromItemGuid).ToListAsync();
list.ForEach(x =>
{
x.Id = NewId.NextGuid();
- x.ParentId = fully.ThisTiem;
+ x.ParentId = fully.ThisItemGuid;
});
await _frontAuditConfigRepository.AddRangeAsync(list);
await _frontAuditConfigRepository.SaveChangesAsync();
@@ -593,11 +593,11 @@ namespace IRaCIS.Core.Application.Service
public async Task CopyOtherToThisItem(CopyOtherToThisItem item)
{
- var lists = _frontAuditConfigRepository.Where(x => x.ParentId == item.AddItem).ToList();
+ var lists = _frontAuditConfigRepository.Where(x => x.ParentId == item.AddItemGuid).ToList();
- var additem = await _frontAuditConfigRepository.FirstOrDefaultAsync(x => x.Id == item.AddItem);
+ var additem = await _frontAuditConfigRepository.FirstOrDefaultAsync(x => x.Id == item.AddItemGuid);
- var alllist = _frontAuditConfigRepository.Where(x => item.DataSource.Contains(x.ParentId)).ToList().GroupBy(x => new { x.ValueCN }, (key, lst) => new FrontAuditConfig
+ var alllist = _frontAuditConfigRepository.Where(x => item.DataSourceGuids.Contains(x.ParentId)).ToList().GroupBy(x => new { x.ValueCN }, (key, lst) => new FrontAuditConfig
{
Sort = lst.Select(x => x.Sort).FirstOrDefault(),
IsShowByTrialConfig= lst.Select(x => x.IsShowByTrialConfig).FirstOrDefault(),
@@ -609,7 +609,7 @@ namespace IRaCIS.Core.Application.Service
EnumList = lst.Select(x => x.EnumList).FirstOrDefault(),
//IsConfig = lst.Select(x => x.IsConfig).FirstOrDefault(),
IsShowParent = lst.Select(x => x.IsShowParent).FirstOrDefault(),
- ParentId = item.AddItem,
+ ParentId = item.AddItemGuid,
CreateUserId = _userInfo.Id,
IsEnable = lst.Select(x => x.IsEnable).FirstOrDefault(),
DictionaryKey = lst.Select(x => x.DictionaryKey).FirstOrDefault(),
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index eebf4ac35..e5b6ea375 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -131,19 +131,19 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as Trial;
List trials = new List();
- var trialids = new List();
+ var dictionaryIds = new List();
if (entity.TrialDicList == null || entity.TrialDicList.Count == 0)
{
- trialids = await this._dbContext.TrialDictionary.Where(x => x.TrialId == entity.Id && x.KeyName == "Criterion").Select(x => x.DictionaryId).ToListAsync();
+ dictionaryIds = await this._dbContext.TrialDictionary.Where(x => x.TrialId == entity.Id && x.KeyName == "Criterion").Select(x => x.DictionaryId).ToListAsync();
}
else
{
- trialids = entity.TrialDicList.Select(x => x.DictionaryId).ToList();
+ dictionaryIds = entity.TrialDicList.Select(x => x.DictionaryId).ToList();
}
- trials = await this._dbContext.Dictionary.Where(x => trialids.Contains(x.Id)).Select(x => x.ValueCN).ToListAsync();
+ trials = await this._dbContext.Dictionary.Where(x => dictionaryIds.Contains(x.Id)).Select(x => x.ValueCN).ToListAsync();
await InsertInspection(item.Entity, type, x => new DataInspection()