diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj index 994048d2..145bf728 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj +++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj @@ -68,12 +68,12 @@ - - + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -81,10 +81,10 @@ - + - - + + diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj index ddd196c9..9741b864 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj @@ -64,7 +64,7 @@ - + @@ -72,7 +72,7 @@ - + true @@ -83,24 +83,24 @@ true - + - - + + true - - + + true - + - - + + diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs index 7f5d755d..ef3bbfa8 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs @@ -48,7 +48,7 @@ namespace IRaCIS.Application.Contracts - public DicDataTypeEnum? DataTypeEnum { get; set; } + public DicDataTypeEnum DataTypeEnum { get; set; } //是配置的话,就有值 public Guid? ConfigTypeId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index bc8ae4b0..9ce5152f 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -117,9 +117,16 @@ namespace IRaCIS.Application.Services // return result; // } //} + + + //if (addOrEditBasic.Id != null ) + //{ + // await _dicRepository.BatchUpdateNoTrackingAsync(t => t.ParentId == addOrEditBasic.Id, c => new Dictionary() { DataTypeEnum = addOrEditBasic.DataTypeEnum }); + //} + var entity = await _dicRepository.InsertOrUpdateAsync(addOrEditBasic, true, verifyExp1); - await _dicRepository.BatchUpdateNoTrackingAsync(t => t.ParentId == entity.Id, c => new Dictionary() { DataTypeEnum = entity.DataTypeEnum }); + await _dicRepository.SaveChangesAsync(); return ResponseOutput.Ok(entity.Id.ToString()); diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 68ed9eaf..641f9538 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -25,7 +25,9 @@ namespace IRaCIS.Application.Services [UnitOfWork] public async Task Get() { - + //var a = ((Decimal)1.00).ToString().TrimEnd(new char[] { '.', '0' }); + //var b = ((Decimal)1.01).ToString().TrimEnd(new char[] { '.', '0' }); + //var c = ((Decimal)100).ToString().TrimEnd(new char[] { '.', '0' }); //var subject1 = Guid.Parse("431D0C58-ABC5-4166-B9BC-08DA0E391693"); //var subject2 = Guid.Parse("431D0C58-ABC5-4166-B9BC-08DA0E391694"); diff --git a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj index a297c318..bd48e5c4 100644 --- a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj +++ b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj index c97358db..d68ade0d 100644 --- a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj +++ b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj @@ -18,7 +18,7 @@ - + diff --git a/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj b/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj index a0029472..efe831ae 100644 --- a/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj +++ b/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj @@ -10,12 +10,12 @@ - + - + - - + +