保底绩效修改

performance/Performance.Services/GuaranteeService.cs

@@ -99,43 +99,18 @@ public List<cof_guarantee> GuarantInsert(GuaranteeRequest request)
         public List<cof_guarantee> GuarantUpdate(GuaranteeRequest request)
         {
             var guarantee = perforCofguaranteeRepository.GetEntity(t => t.Id == request.Source.FirstOrDefault().GId);
-            var guaranteeList = perforCofguaranteeRepository.GetEntities(t => t.UnitType == guarantee.UnitType && t.Target == guarantee.Target);
+            var guaranteeList = perforCofguaranteeRepository.GetEntities(t => t.AllotId == guarantee.AllotId && t.UnitType == guarantee.UnitType && t.Target == guarantee.Target);
             if (guaranteeList == null)
                 throw new PerformanceException("提交数据无效");
 
-            #region 修改优先级
-            int flag = guaranteeList.FirstOrDefault().Priority.Value;
-            if (flag > request.Priority)
-            {
-                var list = perforCofguaranteeRepository.GetEntities(t => t.AllotId == request.AllotId && t.UnitType == request.UnitType && t.Priority >= request.Priority && t.Priority < flag);
-                if (list != null && list.Any())
-                {
-                    list?.ForEach(t => { t.Priority = t.Priority + 1; });
-                    perforCofguaranteeRepository.UpdateRange(list.ToArray());
-                }
-            }
-            else if (flag < request.Priority)
-            {
-                var list = perforCofguaranteeRepository.GetEntities(t => t.AllotId == request.AllotId && t.UnitType == request.UnitType && t.Priority <= request.Priority && t.Priority > flag);
-                if (list != null && list.Any())
-                {
-                    list.ForEach(t => { t.Priority = t.Priority - 1; });
-                    perforCofguaranteeRepository.UpdateRange(list.ToArray());
-                }
-            }
-            else if (flag == request.Priority)
-            {
-                var list = perforCofguaranteeRepository.GetEntities(t => t.AllotId == request.AllotId && t.UnitType == request.UnitType && t.Priority == request.Priority);
-                if (list != null && list.Any())
-                {
-                    list?.ForEach(t => { t.Priority = t.Priority + 1; });
-                    perforCofguaranteeRepository.UpdateRange(list.ToArray());
-                }
-            }
-            #endregion
-
             #region 添加
-            var insertList = request.Source.Where(t => t.GId.HasValue && t.GId == 0).Select(t => new cof_guarantee { Source = t.GValue }).ToList();
+            //a合并到b集合  过滤b集合中已存在的Source
+            var filterList = perforCofguaranteeRepository.GetEntities(t => t.AllotId == guarantee.AllotId && t.UnitType == request.UnitType && t.Target == request.Target);
+
+            if(request.UnitType != guarantee.UnitType && filterList != null && filterList.Count > 0)
+                throw new PerformanceException($"{((UnitType)request.UnitType).ToString()}已存在{request.Target},请重新选择");
+
+            var insertList = request.Source.Where(t => t.GId.HasValue && t.GId == 0 && !filterList.Select(g => g.Source).Contains(t.GValue)).Select(t => new cof_guarantee { Source = t.GValue }).ToList();
             insertList.ForEach(t =>
             {
                 t.AllotId = request.AllotId;
@@ -155,7 +130,7 @@ public List<cof_guarantee> GuarantUpdate(GuaranteeRequest request)
                     t.Source = request.Source.FirstOrDefault(s => s.GId == t.Id).GValue;
                 else
                     delItem.Add(t.Id);
-                t.Priority = request.Priority;
+                //t.Priority = request.Priority;
                 t.UnitType = request.UnitType;
                 t.Target = request.Target;
             });
@@ -167,6 +142,36 @@ public List<cof_guarantee> GuarantUpdate(GuaranteeRequest request)
                 perforCofguaranteeRepository.RemoveRange(guaranteeList.Where(t => delItem.Contains(t.Id)).ToArray());
             #endregion
 
+            #region 修改优先级
+            int flag = guaranteeList.FirstOrDefault().Priority.Value;
+            if (flag > request.Priority)
+            {
+                var list = perforCofguaranteeRepository.GetEntities(t => t.AllotId == request.AllotId && t.UnitType == request.UnitType && t.Priority >= request.Priority && t.Priority < flag);
+                if (list != null && list.Any())
+                {
+                    list?.ForEach(t => { t.Priority = t.Priority + 1; });
+                    perforCofguaranteeRepository.UpdateRange(list.ToArray());
+                }
+            }
+            else if (flag < request.Priority)
+            {
+                var list = perforCofguaranteeRepository.GetEntities(t => t.AllotId == request.AllotId && t.UnitType == request.UnitType && t.Priority <= request.Priority && t.Priority > flag);
+                if (list != null && list.Any())
+                {
+                    list.ForEach(t => { t.Priority = t.Priority - 1; });
+                    perforCofguaranteeRepository.UpdateRange(list.ToArray());
+                }
+            }
+            else if (flag == request.Priority)
+            {
+                if (filterList != null && filterList.Any())
+                {
+                    filterList?.ForEach(t => { t.Priority = t.Priority + 1; });
+                    perforCofguaranteeRepository.UpdateRange(filterList.ToArray());
+                }
+            }
+            #endregion
+
             guaranteeList.AddRange(insertList);
             return guaranteeList.Where(t => !delItem.Contains(t.Id))?.ToList();
         }