删除保底绩效

performance/Performance.Api/Controllers/GuaranteeController.cs

@@ -75,7 +75,7 @@ public ApiResponse<List<cof_guarantee>> GuarantUpdate([CustomizeValidator(RuleSe
         [HttpPost]
         public ApiResponse<cof_guarantee> GuarantDelete([CustomizeValidator(RuleSet = "Delete"), FromBody]GuaranteeRequest request)
         {
-            var result = guaranteeService.GuarantDelete(request.Id);
+            var result = guaranteeService.GuarantDelete(request);
             if (result)
                 return new ApiResponse<cof_guarantee>(ResponseType.OK, "删除配置成功");
             return new ApiResponse<cof_guarantee>(ResponseType.Fail, "删除配置失败");

performance/Performance.DtoModels/Request/GuaranteeRequest.cs

@@ -42,14 +42,17 @@ public GuaranteeRequestValidator()
                 RuleFor(x => x.Priority).NotNull().GreaterThan(0);
             });
 
-            RuleSet("Update", () =>
-            {
-                RuleFor(x => x.Id).NotNull().GreaterThan(0);
-            });
+            //RuleSet("Update", () =>
+            //{
+            //    RuleFor(x => x.Id).NotNull().GreaterThan(0);
+            //});
 
             RuleSet("Delete", () =>
             {
-                RuleFor(x => x.Id).NotNull().GreaterThan(0);
+                RuleFor(x => x.AllotId).NotNull().GreaterThan(0);
+                RuleFor(x => x.Priority).NotNull().GreaterThan(0);
+                RuleFor(x => x.UnitType).NotNull().GreaterThan(0);
+                RuleFor(x => x.Target).NotEmpty();
             });
         }
     }

performance/Performance.Services/GuaranteeService.cs

@@ -166,12 +166,12 @@ public List<cof_guarantee> GuarantUpdate(GuaranteeRequest request)
         /// </summary>
         /// <param name="allotId"></param>
         /// <returns></returns>
-        public bool GuarantDelete(int id)
+        public bool GuarantDelete(GuaranteeRequest request)
         {
-            var guarantee = perforCofguaranteeRepository.GetEntity(t => t.Id == id);
-            if (guarantee == null)
+            var list = perforCofguaranteeRepository.GetEntities(t => t.AllotId == request.AllotId && t.UnitType == request.UnitType && t.Target == request.Target && t.Priority == request.Priority);
+            if (list == null)
                 return false;
-            return perforCofguaranteeRepository.Remove(guarantee);
+            return perforCofguaranteeRepository.RemoveRange(list.ToArray());
         }
 
         /// <summary>