diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index f247e552c..fbffa5625 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -56,7 +56,7 @@ - + 复制配置项及其子项 @@ -70,7 +70,7 @@ 数据集 - + 翻译稽查数据 diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs index 63d16a2f7..ddf2a7d6c 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs @@ -6,8 +6,8 @@ using System; using IRaCIS.Core.Domain.Share; using System.Collections.Generic; -using IRaCIS.Core.Infra.EFCore.Dto; using System.ComponentModel.DataAnnotations; +using IRaCIS.Core.Infra.EFCore.Common.Dto; namespace IRaCIS.Core.Application.ViewModel { diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs index 63e247a62..9b1f7acbc 100644 --- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs @@ -9,8 +9,8 @@ using Microsoft.AspNetCore.Mvc; using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.ViewModel; using Castle.Core.Internal; -using IRaCIS.Core.Infra.EFCore.Dto; using MassTransit; +using IRaCIS.Core.Infra.EFCore.Common.Dto; namespace IRaCIS.Core.Application.Service { diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index da640b355..6bf22b47e 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -3,7 +3,6 @@ using IRaCIS.Core.Application.Contracts; using IRaCIS.Core.Application.Service.Inspection.DTO; using IRaCIS.Core.Application.Service.Inspection.Interface; using IRaCIS.Core.Domain.Share; -using IRaCIS.Core.Infra.EFCore.Dto; using IRaCIS.Core.Infrastructure; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index d5e8c40ac..91b0e60b2 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -2,7 +2,6 @@ using IRaCIS.Core.Domain.Models; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Infra.EFCore.Common.Dto; -using IRaCIS.Core.Infra.EFCore.Dto; using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Infrastructure.Extention; using Microsoft.EntityFrameworkCore; @@ -53,7 +52,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common await InsertAddEntitys(entitys.Where(x => x.State == EntityState.Added).ToList(), "Add"); // 修改 - await InsertAddEntitys(entitys.Where(x => x.State == EntityState.Modified||x.State==EntityState.Unchanged).ToList(), "Update"); + await InsertAddEntitys(entitys.Where(x => x.State == EntityState.Modified).ToList(), "Update"); // 删除 await InsertAddEntitys(entitys.Where(x => x.State == EntityState.Deleted).ToList(), "Deleted"); diff --git a/IRaCIS.Core.Infra.EFCore/Dto/DateDto.cs b/IRaCIS.Core.Infra.EFCore/Common/Dto/DateDto.cs similarity index 84% rename from IRaCIS.Core.Infra.EFCore/Dto/DateDto.cs rename to IRaCIS.Core.Infra.EFCore/Common/Dto/DateDto.cs index f207ea4f0..730d300bf 100644 --- a/IRaCIS.Core.Infra.EFCore/Dto/DateDto.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/Dto/DateDto.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace IRaCIS.Core.Infra.EFCore.Dto +namespace IRaCIS.Core.Infra.EFCore.Common.Dto { public class DateDto { diff --git a/IRaCIS.Core.Infra.EFCore/Dto/ForeignKey.cs b/IRaCIS.Core.Infra.EFCore/Common/Dto/ForeignKey.cs similarity index 81% rename from IRaCIS.Core.Infra.EFCore/Dto/ForeignKey.cs rename to IRaCIS.Core.Infra.EFCore/Common/Dto/ForeignKey.cs index 0897bed45..54fe5eb7b 100644 --- a/IRaCIS.Core.Infra.EFCore/Dto/ForeignKey.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/Dto/ForeignKey.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace IRaCIS.Core.Infra.EFCore.Dto +namespace IRaCIS.Core.Infra.EFCore.Common.Dto { public class ForeignKey { diff --git a/IRaCIS.Core.Infra.EFCore/Dto/SetDictionaryValueDto.cs b/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs similarity index 98% rename from IRaCIS.Core.Infra.EFCore/Dto/SetDictionaryValueDto.cs rename to IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs index c19d8b891..fb3c8a1c6 100644 --- a/IRaCIS.Core.Infra.EFCore/Dto/SetDictionaryValueDto.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using System.ComponentModel.DataAnnotations; -namespace IRaCIS.Core.Infra.EFCore.Dto +namespace IRaCIS.Core.Infra.EFCore.Common.Dto { public class SetInspectionEnumValueDto { diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 4598080d1..bfc9e94fb 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -16,8 +16,8 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.ValueGeneration; using UserTypeGroup = IRaCIS.Core.Domain.Models.UserTypeGroup; -using IRaCIS.Core.Infra.EFCore.Dto; using IRaCIS.Core.Infra.EFCore.Common; +using IRaCIS.Core.Infra.EFCore.Common.Dto; namespace IRaCIS.Core.Infra.EFCore { @@ -371,7 +371,7 @@ namespace IRaCIS.Core.Infra.EFCore public async Task AddAudit() { - var entities = ChangeTracker.Entries().Where(u => (u.State == EntityState.Modified||u.State==EntityState.Unchanged || u.State == EntityState.Deleted || u.State == EntityState.Added)).Where(x => x.Entity.GetType() != typeof(DataInspection)).ToList(); + var entities = ChangeTracker.Entries().Where(u => (u.State == EntityState.Modified|| u.State == EntityState.Deleted || u.State == EntityState.Added)).Where(x => x.Entity.GetType() != typeof(DataInspection)).ToList(); AuditingData auditingData = new AuditingData(this, _userInfo); await auditingData.IncomingEntitys(entities); } diff --git a/IRaCIS.Core.Infra.EFCore/Repository/IRepository.cs b/IRaCIS.Core.Infra.EFCore/Repository/IRepository.cs index ccec5066f..358100dbb 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/IRepository.cs +++ b/IRaCIS.Core.Infra.EFCore/Repository/IRepository.cs @@ -13,7 +13,7 @@ using System.Linq.Expressions; using System.Threading.Tasks; using EFCore.BulkExtensions; using IRaCIS.Core.Domain.Share; -using IRaCIS.Core.Infra.EFCore.Dto; +using IRaCIS.Core.Infra.EFCore.Common.Dto; namespace IRaCIS.Core.Infra.EFCore { diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs index eb8dce2ec..8b0e1b5d2 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs +++ b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs @@ -17,9 +17,9 @@ using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Infrastructure.Extention; using Microsoft.Data.SqlClient; using Newtonsoft.Json; -using IRaCIS.Core.Infra.EFCore.Dto; using Newtonsoft.Json.Linq; using IRaCIS.Core.Domain.Common; +using IRaCIS.Core.Infra.EFCore.Common.Dto; namespace IRaCIS.Core.Infra.EFCore {