From bf693c8bc3dac6d527e1714620268113a1b502d4 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 26 Apr 2022 09:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Repository/ICommandRepository.cs                | 13 +++++++++----
 IRaCIS.Core.Infra.EFCore/Repository/Repository.cs   | 10 +++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Infra.EFCore/Repository/ICommandRepository.cs b/IRaCIS.Core.Infra.EFCore/Repository/ICommandRepository.cs
index 607b6a3fa..dbc5b5f8e 100644
--- a/IRaCIS.Core.Infra.EFCore/Repository/ICommandRepository.cs
+++ b/IRaCIS.Core.Infra.EFCore/Repository/ICommandRepository.cs
@@ -37,14 +37,19 @@ namespace IRaCIS.Core.Infra.EFCore
         /// <summary>批量删除，EF跟踪方式（所有查询出来，再删除 浪费性能,但是稽查 或者触发某些操作时，需要知道数据库实体信息 不可避免用这种）</summary>
         Task<List<TEntity>> TrackingBatchDeleteAsync(Expression<Func<TEntity, bool>> deleteFilter);
 
-        /// <summary> EF跟踪方式 先查询出来，再更新部分字段 稽查的时候需要完整的实体信息</summary>
-        Task<bool> UpdatePartialAsync(TEntity entity, Expression<Func<TEntity, TEntity>> updateFactory,
+        /// <summary> EF跟踪方式 已有查询好的，再更新部分字段 稽查的时候需要完整的实体信息</summary>
+        Task<bool> PartialUpdateAsync(TEntity entity, Expression<Func<TEntity, TEntity>> updateFactory,
             bool autoSave = false, CancellationToken cancellationToken = default);
 
         /// <summary> EF跟踪方式 先查询出来，再更新部分字段 稽查的时候需要完整的实体信息</summary>
-        Task<TEntity> UpdatePartialSearchFirstAsync(Guid id, Expression<Func<TEntity, TEntity>> updateFactory,
+        Task<TEntity> QueryThenPartiallyUpdateAsync(Guid id, Expression<Func<TEntity, TEntity>> updateFactory,
             bool autoSave = false, CancellationToken cancellationToken = default);
-        
+
+        Task QueryThenPartiallyUpdateAsync(Expression<Func<TEntity, bool>> updateFilter,
+            Expression<Func<TEntity, TEntity>> updateFactory,
+            bool autoSave = false, CancellationToken cancellationToken = default);
+
+
 
     }
 
diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
index 55e0af46b..26e5dfc08 100644
--- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
+++ b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
@@ -228,7 +228,7 @@ namespace IRaCIS.Core.Infra.EFCore
 
 
         /// <summary>EF跟踪方式  外层先有查询好的完成实体，再更新部分字段  稽查的时候需要完整的实体信息</summary>
-        public async Task<bool> UpdatePartialAsync(TEntity waitModifyEntity, Expression<Func<TEntity, TEntity>> updateFactory, bool autoSave = false, CancellationToken cancellationToken = default)
+        public async Task<bool> PartialUpdateAsync(TEntity waitModifyEntity, Expression<Func<TEntity, TEntity>> updateFactory, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             var entityEntry = _dbContext.Entry(waitModifyEntity);
             entityEntry.State = EntityState.Detached;
@@ -240,7 +240,7 @@ namespace IRaCIS.Core.Infra.EFCore
 
         }
 
-        public async Task UpdatePartialSearchFirstAsync(Expression<Func<TEntity, bool>> updateFilter,
+        public async Task QueryThenPartiallyUpdateAsync(Expression<Func<TEntity, bool>> updateFilter,
             Expression<Func<TEntity, TEntity>> updateFactory,
             bool autoSave = false, CancellationToken cancellationToken = default)
         {
@@ -253,14 +253,14 @@ namespace IRaCIS.Core.Infra.EFCore
 
             foreach (var needUpdateEntity in searchEntityList)
             {
-                await UpdatePartialAsync(needUpdateEntity, updateFactory, autoSave);
+                await PartialUpdateAsync(needUpdateEntity, updateFactory, autoSave);
             }
 
         }
 
 
         /// <summary>EF跟踪方式  先查询出来，再更新部分字段 稽查的时候需要完整的实体信息</summary>
-        public async Task<TEntity> UpdatePartialSearchFirstAsync(Guid id, Expression<Func<TEntity, TEntity>> updateFactory,
+        public async Task<TEntity> QueryThenPartiallyUpdateAsync(Guid id, Expression<Func<TEntity, TEntity>> updateFactory,
             bool autoSave = false, CancellationToken cancellationToken = default)
         {
             //不跟踪 查询出来的实体就是Detached
@@ -281,7 +281,7 @@ namespace IRaCIS.Core.Infra.EFCore
             return searchEntity;
         }
 
-
+        /// <summary>应用更新后拥有完整的实体信息，便于稽查</summary>
         private void ModifyPartialFiled(TEntity waitModifyEntity, Expression<Func<TEntity, TEntity>> updateFactory)
         {
             List<PropertyInfo> list = ((MemberInitExpression)updateFactory.Body).Bindings.Select(mb => mb.Member.Name)