修改Update方法

API/TaskManager.EntityFramework/Repository/Repository.cs

@@ -55,10 +55,6 @@ namespace TaskManager.EntityFramework.Repository
 
         public async Task UpdateAsync(TEntity entity)
         {
-            //product 已前台更新后
-            _context.Attach(entity);
-            _context.Entry(entity).State = EntityState.Modified;
-
             _dbSet.Update(entity);
             await _context.SaveChangesAsync();
         }

API/Wood.Service/Controllers/NormalBaseController.cs

@@ -75,14 +75,14 @@ namespace Wood.Service.Controllers
         /// <param name="entity"></param>
         /// <returns></returns>
         [HttpPut("{id}")]
-        public async virtual Task<IActionResult> Update(T entity)
+        public async virtual Task<IActionResult> Update(long UId, T entity)
         {
-            var _first = await _repository.GetByIdAsync(entity.UId);
+            var _first = await _repository.GetByIdAsync(UId);
             if (_first == null)
             {
                 return new JsonResult(new { Code = 400, Message = "修改失败!" });
             }
-
+            EntityMapper.Trans(_first, entity, "UId");
 
             await _repository.UpdateAsync(entity);
             return new JsonResult(new { Code = 200, Message = "修改成功!" });

API/Wood.Service/Datas/SupplierEmployeeDtService.cs

@@ -82,7 +82,7 @@ namespace Wood.Service.Datas
                 //添加任务明细
                 foreach (var empDtObj in entityLst)
                 {
-                    SUPPLIER_EMPLOYEE empObj = ExpressionGenericMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(empDtObj);
+                    SUPPLIER_EMPLOYEE empObj = EntityMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(empDtObj);
                     empObj.TaskId = taskSubObj.TaskId;
                     await _supplierEmployeeRepository.AddAsync(empObj);
                 }
@@ -106,7 +106,7 @@ namespace Wood.Service.Datas
                     {
                         empDtObj.UId = firstObj.UId;
                         empDtObj.CreationTime = CommonHelper.CurrentTime;
-                        var ret = await base.Update(empDtObj);
+                        var ret = await base.Update(firstObj.UId, empDtObj);
                     }
                 }
                 #endregion
@@ -131,7 +131,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_EMPLOYEE empObj = ExpressionGenericMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(entity);
+                SUPPLIER_EMPLOYEE empObj = EntityMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierEmployeeRepository.AddAsync(empObj);
 
@@ -163,7 +163,7 @@ namespace Wood.Service.Datas
             }
         }
 
-        public override async Task<IActionResult> Update(SUPPLIER_EMPLOYEE_DT entity)
+        public override async Task<IActionResult> Update(long UId, SUPPLIER_EMPLOYEE_DT entity)
         {
             using var transaction = _context.Database.BeginTransaction();
             try
@@ -173,7 +173,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_EMPLOYEE empObj = ExpressionGenericMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(entity);
+                SUPPLIER_EMPLOYEE empObj = EntityMapper<SUPPLIER_EMPLOYEE_DT, SUPPLIER_EMPLOYEE>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierEmployeeRepository.AddAsync(empObj);
 
@@ -191,7 +191,7 @@ namespace Wood.Service.Datas
                 }
                 else
                 {
-                    var ret = await base.Update(entity);
+                    var ret = await base.Update(firstObj.UId, entity);
                 }
                 #endregion
 

API/Wood.Service/Datas/SupplierInfoDtService.cs

@@ -81,7 +81,7 @@ namespace Wood.Service.Datas
                 //添加任务明细
                 foreach (var empDtObj in entityLst)
                 {
-                    SUPPLIER_INFO empObj = ExpressionGenericMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(empDtObj);
+                    SUPPLIER_INFO empObj = EntityMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(empDtObj);
                     empObj.TaskId = taskSubObj.TaskId;
                     await _supplierInfoRepository.AddAsync(empObj);
                 }
@@ -104,7 +104,7 @@ namespace Wood.Service.Datas
                     {
                         empDtObj.UId = firstObj.UId;
                         empDtObj.CreationTime = CommonHelper.CurrentTime;
-                        var ret = await base.Update(empDtObj);
+                        var ret = await base.Update(firstObj.UId, empDtObj);
                     }
                 }
                 #endregion
@@ -131,7 +131,7 @@ namespace Wood.Service.Datas
                 await _taskSubRepository.AddAsync(taskSubObj);
 
                 //添加任务明细
-                SUPPLIER_INFO empObj = ExpressionGenericMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(entity);
+                SUPPLIER_INFO empObj = EntityMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierInfoRepository.AddAsync(empObj);
 
@@ -162,7 +162,7 @@ namespace Wood.Service.Datas
             }
         }
 
-        public override async Task<IActionResult> Update(SUPPLIER_INFO_DT entity)
+        public override async Task<IActionResult> Update(long UId, SUPPLIER_INFO_DT entity)
         {
             using var transaction = _context.Database.BeginTransaction();
             try
@@ -172,7 +172,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_INFO empObj = ExpressionGenericMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(entity);
+                SUPPLIER_INFO empObj = EntityMapper<SUPPLIER_INFO_DT, SUPPLIER_INFO>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierInfoRepository.AddAsync(empObj);
 
@@ -189,7 +189,7 @@ namespace Wood.Service.Datas
                 }
                 else
                 {
-                    var ret = await base.Update(entity);
+                    var ret = await base.Update(firstObj.UId, entity);
                 }
                 #endregion
 

API/Wood.Service/Datas/SupplierProAttachmentDataDtService.cs

@@ -82,7 +82,7 @@ namespace Wood.Service.Datas
                 //添加任务明细
                 foreach (var empDtObj in entityLst)
                 {
-                    SUPPLIER_PRO_ATTACHMENT_DATA empObj = ExpressionGenericMapper<SUPPLIER_PRO_ATTACHMENT_DATA_DT, SUPPLIER_PRO_ATTACHMENT_DATA>.Trans(empDtObj);
+                    SUPPLIER_PRO_ATTACHMENT_DATA empObj = EntityMapper<SUPPLIER_PRO_ATTACHMENT_DATA_DT, SUPPLIER_PRO_ATTACHMENT_DATA>.Trans(empDtObj);
                     empObj.TaskId = taskSubObj.TaskId;
                     await _supplierProAttachmentDataRepository.AddAsync(empObj);
                 }
@@ -114,7 +114,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_PRO_ATTACHMENT_DATA empObj = ExpressionGenericMapper<SUPPLIER_PRO_ATTACHMENT_DATA_DT, SUPPLIER_PRO_ATTACHMENT_DATA>.Trans(entity);
+                SUPPLIER_PRO_ATTACHMENT_DATA empObj = EntityMapper<SUPPLIER_PRO_ATTACHMENT_DATA_DT, SUPPLIER_PRO_ATTACHMENT_DATA>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierProAttachmentDataRepository.AddAsync(empObj);
 

API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs

@@ -82,7 +82,7 @@ namespace Wood.Service.Datas
                 //添加任务明细
                 foreach (var empDtObj in entityLst)
                 {
-                    SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = ExpressionGenericMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(empDtObj);
+                    SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = EntityMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(empDtObj);
                     empObj.TaskId = taskSubObj.TaskId;
                     await _supplierProProcessEquipmentRepository.AddAsync(empObj);
                 }
@@ -104,7 +104,7 @@ namespace Wood.Service.Datas
                     {
                         empDtObj.UId = firstObj.UId;
                         empDtObj.CreationTime = CommonHelper.CurrentTime;
-                        var ret = await base.Update(empDtObj);
+                        var ret = await base.Update(firstObj.UId, empDtObj);
                     }
                 }
                 #endregion
@@ -129,7 +129,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = ExpressionGenericMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(entity);
+                SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = EntityMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierProProcessEquipmentRepository.AddAsync(empObj);
 
@@ -159,7 +159,7 @@ namespace Wood.Service.Datas
             }
         }
 
-        public override async Task<IActionResult> Update(SUPPLIER_PRO_PROCESS_EQUIPMENT_DT entity)
+        public override async Task<IActionResult> Update(long UId, SUPPLIER_PRO_PROCESS_EQUIPMENT_DT entity)
         {
             using var transaction = _context.Database.BeginTransaction();
             try
@@ -169,7 +169,7 @@ namespace Wood.Service.Datas
                 TaskSub taskSubObj = _commonService.BuildTaskSub(1, _taskName);
                 await _taskSubRepository.AddAsync(taskSubObj);
                 //添加任务明细
-                SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = ExpressionGenericMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(entity);
+                SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = EntityMapper<SUPPLIER_PRO_PROCESS_EQUIPMENT_DT, SUPPLIER_PRO_PROCESS_EQUIPMENT>.Trans(entity);
                 empObj.TaskId = taskSubObj.TaskId;
                 await _supplierProProcessEquipmentRepository.AddAsync(empObj);
 
@@ -185,7 +185,7 @@ namespace Wood.Service.Datas
                 }
                 else
                 {
-                    var ret = await base.Update(entity);
+                    var ret = await base.Update(firstObj.UId, entity);
                 }
                 #endregion
 

API/Wood.Util/CommonHelper.cs

@@ -65,10 +65,10 @@ namespace Wood.Util
     /// </summary>
     /// <typeparam name="TIn"></typeparam>
     /// <typeparam name="TOut"></typeparam>
-    public class ExpressionGenericMapper<TIn, TOut>//Mapper`2
+    public class EntityMapper<TIn, TOut>//Mapper`2
     {
         private static Func<TIn, TOut> _FUNC = null;
-        static ExpressionGenericMapper()
+        static EntityMapper()
         {
             ParameterExpression parameterExpression = Expression.Parameter(typeof(TIn), "p");
             List<MemberBinding> memberBindingList = new List<MemberBinding>();
@@ -96,4 +96,43 @@ namespace Wood.Util
             return _FUNC(t);
         }
     }
+
+
+    /// <summary>
+    /// 反射实现Mapper
+    /// </summary>
+    public class EntityMapper
+    {
+        /// <summary>
+        /// 反射
+        /// </summary>
+        /// <typeparam name="TIn"></typeparam>
+        /// <typeparam name="TOut"></typeparam>
+        /// <param name="tIn"></param>
+        /// <returns></returns>
+        public static void Trans<TIn, TOut>(TIn tIn, TOut tOut, string excludeMembers = "")
+        {
+            string[] excludeMemberArr = excludeMembers.Split(",").Select(itm => itm.Trim()).ToArray();
+
+            foreach (var itemOut in tOut.GetType().GetProperties())
+            {
+                if (excludeMemberArr.Contains(itemOut.Name))
+                {
+                    continue;
+                }
+                var propIn = tIn.GetType().GetProperty(itemOut.Name);
+                itemOut.SetValue(tOut, propIn.GetValue(tIn, null), null);
+            }
+
+            foreach (var itemOut in tOut.GetType().GetFields())
+            {
+                if (excludeMemberArr.Contains(itemOut.Name))
+                {
+                    continue;
+                }
+                var fieldIn = tIn.GetType().GetField(itemOut.Name);
+                itemOut.SetValue(tOut, fieldIn.GetValue(tIn));
+            }
+        }
+    }
 }