|
|
@ -205,7 +205,7 @@ namespace Shentun.Peis.ColumnReferences |
|
|
if (columnReferenceCode == null) |
|
|
if (columnReferenceCode == null) |
|
|
{ |
|
|
{ |
|
|
//新建
|
|
|
//新建
|
|
|
columnReferenceCode = await _columnReferenceCodeManager.CreateAsync(new ColumnReferenceCode() |
|
|
|
|
|
|
|
|
columnReferenceCode = await _columnReferenceCodeManager.CreateAsync(new ColumnReferenceCode() |
|
|
{ |
|
|
{ |
|
|
ColumnReferenceId = input.ColumnReferenceId, |
|
|
ColumnReferenceId = input.ColumnReferenceId, |
|
|
CodeValue = input.AppCode.CodeValue |
|
|
CodeValue = input.AppCode.CodeValue |
|
|
@ -293,8 +293,35 @@ namespace Shentun.Peis.ColumnReferences |
|
|
var config = configurationBuilder.Build(); |
|
|
var config = configurationBuilder.Build(); |
|
|
var assemblyName = config.GetSection("Interface").GetSection("AssemblyName").Value; |
|
|
var assemblyName = config.GetSection("Interface").GetSection("AssemblyName").Value; |
|
|
var className = config.GetSection("Interface").GetSection("ClassName").Value; |
|
|
var className = config.GetSection("Interface").GetSection("ClassName").Value; |
|
|
var list = await ReflectionHelper.InvokeAsync <List<ColumnReferenceCodeValue>>(assemblyName, className, [parmValue], "GetAppCodeValuesAsync"); |
|
|
|
|
|
|
|
|
var list = await ReflectionHelper.InvokeAsync<List<ColumnReferenceCodeValue>>(assemblyName, className, [parmValue], "GetAppCodeValuesAsync"); |
|
|
|
|
|
|
|
|
|
|
|
if (list.Count > 0) |
|
|
|
|
|
{ |
|
|
|
|
|
//对照数据
|
|
|
|
|
|
var columnReferenceInterfaceList = (from columnReferenceCode in await _columnReferenceCodeRepository.GetQueryableAsync() |
|
|
|
|
|
join columnReferenceInterface in await _columnReferenceInterfaceRepository.GetQueryableAsync() on columnReferenceCode.Id equals columnReferenceInterface.ColumnReferenceCodeId |
|
|
|
|
|
where columnReferenceCode.ColumnReferenceId == input.Id |
|
|
|
|
|
select new |
|
|
|
|
|
{ |
|
|
|
|
|
columnReferenceCode, |
|
|
|
|
|
columnReferenceInterface |
|
|
|
|
|
}).ToList(); |
|
|
|
|
|
|
|
|
|
|
|
foreach (var item in list) |
|
|
|
|
|
{ |
|
|
|
|
|
var dzList = columnReferenceInterfaceList.Where(m => m.columnReferenceCode.CodeValue == item.CodeValue).Select(s => s.columnReferenceInterface.InterfaceCodeValue).ToList(); |
|
|
|
|
|
if (dzList.Any()) |
|
|
|
|
|
{ |
|
|
|
|
|
item.Exter1 = "Y"; |
|
|
|
|
|
item.Exter2 = dzList.Count.ToString(); |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
item.Exter1 = "N"; |
|
|
|
|
|
item.Exter2 = "0"; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
return list; |
|
|
return list; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -333,7 +360,7 @@ namespace Shentun.Peis.ColumnReferences |
|
|
{ |
|
|
{ |
|
|
var columnReferenceCode = await _columnReferenceCodeRepository.FirstOrDefaultAsync(o => o.ColumnReferenceId == input.ColumnReferenceId && |
|
|
var columnReferenceCode = await _columnReferenceCodeRepository.FirstOrDefaultAsync(o => o.ColumnReferenceId == input.ColumnReferenceId && |
|
|
o.CodeValue == input.CodeValue); |
|
|
o.CodeValue == input.CodeValue); |
|
|
if(columnReferenceCode == null) |
|
|
|
|
|
|
|
|
if (columnReferenceCode == null) |
|
|
{ |
|
|
{ |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
@ -348,14 +375,14 @@ namespace Shentun.Peis.ColumnReferences |
|
|
var className = config.GetSection("Interface").GetSection("ClassName").Value; |
|
|
var className = config.GetSection("Interface").GetSection("ClassName").Value; |
|
|
var list = await ReflectionHelper.InvokeAsync<List<ColumnReferenceCodeValue>>(assemblyName, className, [parmValue], "GetInterfaceCodeValuesAsync"); |
|
|
var list = await ReflectionHelper.InvokeAsync<List<ColumnReferenceCodeValue>>(assemblyName, className, [parmValue], "GetInterfaceCodeValuesAsync"); |
|
|
var result = new List<ColumnReferenceInterfaceCodeValueDto>(); |
|
|
var result = new List<ColumnReferenceInterfaceCodeValueDto>(); |
|
|
foreach ( var item in items) |
|
|
|
|
|
|
|
|
foreach (var item in items) |
|
|
{ |
|
|
{ |
|
|
var columnReferenceInterfaceCodeValueDto = new ColumnReferenceInterfaceCodeValueDto() |
|
|
var columnReferenceInterfaceCodeValueDto = new ColumnReferenceInterfaceCodeValueDto() |
|
|
{ |
|
|
{ |
|
|
CodeValue = item.InterfaceCodeValue, |
|
|
CodeValue = item.InterfaceCodeValue, |
|
|
}; |
|
|
}; |
|
|
var interfaceItem = list.Where(o => o.CodeValue == item.InterfaceCodeValue).FirstOrDefault(); |
|
|
var interfaceItem = list.Where(o => o.CodeValue == item.InterfaceCodeValue).FirstOrDefault(); |
|
|
if(interfaceItem != null) |
|
|
|
|
|
|
|
|
if (interfaceItem != null) |
|
|
{ |
|
|
{ |
|
|
columnReferenceInterfaceCodeValueDto.DisplayName = interfaceItem.DisplayName; |
|
|
columnReferenceInterfaceCodeValueDto.DisplayName = interfaceItem.DisplayName; |
|
|
} |
|
|
} |
|
|
|