Browse Source

字段对照

bjmzak
DESKTOP-G961P6V\Zhh 2 years ago
parent
commit
204cdd3847
  1. 2
      src/Shentun.ColumnReferencePlugIns/ChargeRequestPlugInsBase.cs
  2. 6
      src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugIns.cs
  3. 4
      src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsBase.cs
  4. 2
      src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsDbBase.cs
  5. 2
      src/Shentun.ColumnReferencePlugIns/LisRequestPlugInsBase.cs
  6. 2
      src/Shentun.ColumnReferencePlugIns/PatientRegisterPluginsBase.cs
  7. 2
      src/Shentun.ColumnReferencePlugIns/ThirdPlugInsBase.cs
  8. 2
      src/Shentun.Peis.Application.Contracts/ColumnReferences/ColumnReferenceInterfaceCodeValuesInputDto.cs
  9. 4
      src/Shentun.Peis.Application/ColumnReferences/ColumnReferenceAppService.cs
  10. 2
      test/Shentun.Peis.Application.Tests/ColumnReferenceAppServiceTest.cs
  11. 4
      test/Shentun.Peis.ColumnReference.Tests/ColumnReferencePlugInsTest.cs
  12. 4
      test/Shentun.Peis.EntityFrameworkCore.Tests/EntityFrameworkCore/PeisEntityFrameworkCoreTestModule.cs

2
src/Shentun.ColumnReferencePlugIns/ChargeRequestPlugInsBase.cs

@ -8,7 +8,7 @@ namespace Shentun.Peis.PlugIns
{
public class ChargeRequestPlugInsBase : ThirdPlugInsBase
{
public ChargeRequestPlugInsBase(string configParm) : base(configParm)
public ChargeRequestPlugInsBase(string parmValue) : base(parmValue)
{
}

6
src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugIns.cs

@ -18,7 +18,7 @@ namespace Shentun.Peis.PlugIns
public class ColumnReferenceCodeValue
{
public string Code { get; set; }
public string CodeValue { get; set; }
public string DisplayName { get; set; }
public string Exter1 { get; set; }
public string Exter2 { get; set; }
@ -26,13 +26,13 @@ namespace Shentun.Peis.PlugIns
public string Exter4 { get; set; }
public string Exter5 { get; set; }
public string SimpleCode { get; set; }
public string FilterCode { get; set; }
public string FilterCodeValue { get; set; }
public int DisplayOrder { get; set; }
}
public class ColumnReferenceFilterCodeValue
{
public string Code { get; set; }
public string CodeValue { get; set; }
public string DiaplayName { get; set; }
public int DisplayOrder { get; set; }
}

4
src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsBase.cs

@ -22,7 +22,7 @@ namespace Shentun.Peis.PlugIns
private List<ColumnReferenceColumn> _columns;
private List<ColumnReferenceColumn> _interfaceColumns;
public ColumnReferencePlugInsBase(string configParm)
public ColumnReferencePlugInsBase(string parmValue)
{
AppConfig = new ConfigurationBuilder()
.SetBasePath(DirectoryHelper.GetAppDirectory()) // 设置基础路径为当前目录
@ -32,7 +32,7 @@ namespace Shentun.Peis.PlugIns
.GetSection("Default").Value;
var configurationBuilder = new ConfigurationBuilder()
.AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(configParm)));
.AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue)));
InterfaceConfig = configurationBuilder.Build();
AppSql = InterfaceConfig.GetSection("App").GetSection("Sql").Value;
var columns = InterfaceConfig.GetSection("App").GetSection("Columns").Value;

2
src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsDbBase.cs

@ -17,7 +17,7 @@ namespace Shentun.Peis.PlugIns
protected string InterfaceSql;
protected string InterfaceDbType;
protected string? InterfaceConnctionStr;
public ColumnReferencePlugInsDbBase(string configParm):base(configParm)
public ColumnReferencePlugInsDbBase(string parmValue):base(parmValue)
{
InterfaceSql = InterfaceConfig.GetSection("Interface").GetSection("Sql").Value;
InterfaceDbType = InterfaceConfig.GetSection("Interface").GetSection("DbType").Value;

2
src/Shentun.ColumnReferencePlugIns/LisRequestPlugInsBase.cs

@ -8,7 +8,7 @@ namespace Shentun.Peis.PlugIns
{
public class LisRequestPlugInsBase : ThirdPlugInsBase
{
public LisRequestPlugInsBase(string configParm) : base(configParm)
public LisRequestPlugInsBase(string parmValue) : base(parmValue)
{
}

2
src/Shentun.ColumnReferencePlugIns/PatientRegisterPluginsBase.cs

@ -8,7 +8,7 @@ namespace Shentun.Peis.PlugIns
{
public class PatientRegisterPluginsBase : ThirdPlugInsBase
{
public PatientRegisterPluginsBase(string configParm) : base(configParm)
public PatientRegisterPluginsBase(string parmValue) : base(parmValue)
{
}

2
src/Shentun.ColumnReferencePlugIns/ThirdPlugInsBase.cs

@ -8,7 +8,7 @@ namespace Shentun.Peis.PlugIns
{
public class ThirdPlugInsBase
{
public ThirdPlugInsBase(string configParm)
public ThirdPlugInsBase(string parmValue)
{
}
}

2
src/Shentun.Peis.Application.Contracts/ColumnReferences/ColumnReferenceInterfaceCodeValuesInputDto.cs

@ -7,6 +7,6 @@ namespace Shentun.Peis.ColumnReferences
public class ColumnReferenceInterfaceCodeValuesInputDto
{
public Guid ColumnReferenceId { get; set; }
public string Code { get; set;}
public string CodeValue { get; set;}
}
}

4
src/Shentun.Peis.Application/ColumnReferences/ColumnReferenceAppService.cs

@ -329,7 +329,7 @@ namespace Shentun.Peis.ColumnReferences
[HttpPost("api/app/ColumnReference/GetInterfaceCodeValuesByAppCode")]
public async Task<List<ColumnReferenceInterfaceCodeValueDto>> GetInterfaceCodeValuesByAppCode(ColumnReferenceInterfaceCodeValuesInputDto input)
{
var columnReferenceCode = await _columnReferenceCodeRepository.FirstOrDefaultAsync(o => o.CodeValue == input.Code);
var columnReferenceCode = await _columnReferenceCodeRepository.FirstOrDefaultAsync(o => o.CodeValue == input.CodeValue);
if(columnReferenceCode == null)
{
return null;
@ -351,7 +351,7 @@ namespace Shentun.Peis.ColumnReferences
{
CodeValue = item.InterfaceCodeValue,
};
var interfaceItem = list.Where(o => o.Code == item.InterfaceCodeValue).FirstOrDefault();
var interfaceItem = list.Where(o => o.CodeValue == item.InterfaceCodeValue).FirstOrDefault();
if(interfaceItem != null)
{
columnReferenceInterfaceCodeValueDto.DisplayName = interfaceItem.DisplayName;

2
test/Shentun.Peis.Application.Tests/ColumnReferenceAppServiceTest.cs

@ -104,7 +104,7 @@ namespace Shentun.Peis
var entity = new ColumnReferenceIdInputDto()
{
Id = new Guid("3a1222e4-3249-34a2-85f0-f72e974de543"),
Id = new Guid("035e9caa-3ac8-484a-98be-6c603676228e"),
};

4
test/Shentun.Peis.ColumnReference.Tests/ColumnReferencePlugInsTest.cs

@ -30,7 +30,7 @@ namespace Shentun.Peis.PlugIns.Tests
var items = await columnReferencePlugInsBase.GetAppCodeValuesAsync();
foreach ( var item in items )
{
_output.WriteLine(item.Code + item.DisplayName);
_output.WriteLine(item.CodeValue + item.DisplayName);
}
}
@ -46,7 +46,7 @@ namespace Shentun.Peis.PlugIns.Tests
var items = await columnReferencePlugInsBase.GetInterfaceCodeValuesAsync();
foreach (var item in items)
{
_output.WriteLine(item.Code + item.DisplayName);
_output.WriteLine(item.CodeValue + item.DisplayName);
}
}

4
test/Shentun.Peis.EntityFrameworkCore.Tests/EntityFrameworkCore/PeisEntityFrameworkCoreTestModule.cs

@ -40,8 +40,8 @@ public class PeisEntityFrameworkCoreTestModule : AbpModule
}
private void ConfigurePostGress(IServiceCollection services)
{
string connectStr = "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123";
//string connectStr = "Host=10.1.12.140;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;";
//string connectStr = "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123";
string connectStr = "Host=10.1.12.140;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;";
services.Configure<AbpDbContextOptions>(options =>
{

Loading…
Cancel
Save