模板parentID更改

performance/Performance.Services/AssessService.cs

@@ -162,8 +162,8 @@ public ApiResponse AddColumn(int assessID, int parentID, string columnName, int
             var clist = perforAscolumnsRepository.GetEntities(t => t.ParentID == parentID && t.AssessID == assessID && t.Sort >= sort);
             if (clist != null && clist.Count > 0)
             {
-                int atsort = sort;
-                clist.ForEach(t => { t.Sort = atsort + 1; atsort++; });
+                //int atsort = sort;
+                clist.ForEach(t => t.Sort = t.Sort + 1);//clist.ForEach(t => { t.Sort = atsort + 1; atsort++; });
                 perforAscolumnsRepository.UpdateRange(clist.ToArray());
             }
             var column = new as_columns { AssessID = assessID, ParentID = parentID, ColumnName = columnName, Sort = sort };
@@ -183,7 +183,7 @@ public ApiResponse EditColumn(int columnID, string columnName, int sort)
             if (entity == null)
                 return new ApiResponse(ResponseType.Fail, "考核项目父级ID无效");
             entity.ColumnName = columnName;
-            entity.Sort = sort;
+            //entity.Sort = sort;
             var result = perforAscolumnsRepository.Update(entity);
             return result ? new ApiResponse(ResponseType.OK, entity) : new ApiResponse(ResponseType.Fail);
         }
@@ -314,8 +314,16 @@ public ApiResponse UseTemplate(int allotID, int assessID)
                     result = perforAscolumnsRepository.AddRange(columns.ToArray());
                     if (result)
                     {
-                        columns.ForEach(t => t.ParentID = columns.Where(item => item.TempColumnID == t.ParentID).FirstOrDefault().ID);
-                        perforAscolumnsRepository.UpdateRange(columns.ToArray());
+                        var parentList = columns.Select(t => t.ParentID).Distinct();
+                        var keyvalue = new Dictionary<int?, int>();
+                        foreach (var item in columns.Where(t => parentList.Contains(t.TempColumnID)))
+                        {
+                            keyvalue.Add(item.TempColumnID, item.ID);
+                        }
+                        columns = columns.Where(t => t.ParentID != null).ToList();
+                        columns?.ForEach(t => t.ParentID = keyvalue[t.ParentID]);
+
+                        result = perforAscolumnsRepository.UpdateRange(columns.ToArray());
                     }
                 }
                 return result ? new ApiResponse(ResponseType.OK) : new ApiResponse(ResponseType.Fail);