新增删除所有员工接口

performance/Performance.Api/Controllers/PersonController.cs

@@ -93,6 +93,20 @@ public ApiResponse DeletePerson(int employeeId)
         }
 
         /// <summary>
+        /// 删除所有员工
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        [Route("person/deleteall/{allotId}")]
+        [HttpPost]
+        public ApiResponse DeleteAllPerson(int allotId)
+        {
+            var result = personService.DeleteAllPerson(allotId);
+            return result ? new ApiResponse(ResponseType.OK, "删除成功！")
+                : new ApiResponse(ResponseType.OK, "删除失败！");
+        }
+
+        /// <summary>
         /// 下载当前测算表
         /// </summary>
         /// <returns></returns>

performance/Performance.Services/EmployeeService.cs

@@ -565,7 +565,6 @@ public bool ConfirmAudit(int userid, AprAmountAuditRequest request)
                     item.Status = (request.IsPass == 1) ? 3 : 4;
                     item.AuditUser = userid;
                     item.AuditTime = DateTime.Now;
-                    item.Remark = request.Remark;
                     perapramountRepository.UpdateRange(apramounts.ToArray());
                 }
             }
@@ -966,16 +965,15 @@ public bool ConfirmAuditHide(int userid, AprAmountAuditRequest request)
             var allApramounts = _hideRepository.GetEntities(t => t.AllotId == request.AllotId);
             foreach (var member in request.Members)
             {
-                var apramounts = allApramounts?.Where(t => (t.DoctorName ?? "") == member.DoctorName && (t.PersonnelNumber ?? "") == member.PersonnelNumber);
+                var apramounts = allApramounts?.Where(t => (t.PersonnelNumber ?? "") == member.PersonnelNumber);
                 if (apramounts == null || !apramounts.Any())
-                    throw new PerformanceException("审核信息无效，请确认");
+                    throw new PerformanceException($"工号为“{member.PersonnelNumber}”的审核信息无效，请确认");
 
                 foreach (var item in apramounts)
                 {
                     item.Status = (request.IsPass == 1) ? 3 : 4;
                     item.AuditUser = userid;
                     item.AuditTime = DateTime.Now;
-                    item.Remark = request.Remark;
                     _hideRepository.UpdateRange(apramounts.ToArray());
                 }
             }

performance/Performance.Services/PersonService.cs

@@ -92,7 +92,7 @@ public void CreateAllotPersons(int hospitalId, int allotId, int prevAllotId = -1
 
             var isExist = (peremployeeRepository.GetEntities(t => t.HospitalId == hospitalId && t.AllotId == allotId)?.Count ?? 0) > 0;
             //如果为空则先删除在执行下面的代码
-            if (isExist) { peremployeeRepository.DeleteFromQuery(u => u.HospitalId == hospitalId && u.AllotId == allotId);}
+            if (isExist) { peremployeeRepository.DeleteFromQuery(u => u.HospitalId == hospitalId && u.AllotId == allotId); }
 
 
             List<per_employee> persons = new List<per_employee>();
@@ -322,6 +322,18 @@ public bool DeletePerson(int employeeId)
         }
 
         /// <summary>
+        /// 删除员工
+        /// </summary>
+        /// <param name="employeeId"></param>
+        /// <returns></returns>
+        public bool DeleteAllPerson(int allotId)
+        {
+            var employees = peremployeeRepository.GetEntities(t => t.AllotId == allotId)
+                ?? new List<per_employee>();
+            return peremployeeRepository.RemoveRange(employees.ToArray());
+        }
+
+        /// <summary>
         /// 检查核算单元是否已存在
         /// </summary>
         /// <param name="hosapitalId">医院Id</param>