sort columns

performance/Performance.EntityModels/Entity/as_columns.cs

@@ -39,6 +39,6 @@ public class as_columns
         /// <summary>
         /// 排序
         /// </summary>
-        public Nullable<decimal> Sort { get; set; }
+        public Nullable<int> Sort { get; set; }
     }
 }

performance/Performance.Services/AssessService.cs

@@ -159,26 +159,14 @@ public ApiResponse AddColumn(int assessID, int parentID, string columnName, int
                 if (centity == null)
                     return new ApiResponse(ResponseType.Fail, "考核项目父级ID无效");
             }
-            var column = perforAscolumnsRepository.GetEntity(t => t.ParentID == parentID && t.AssessID == assessID && t.Sort == sort);
             var clist = perforAscolumnsRepository.GetEntities(t => t.ParentID == parentID && t.AssessID == assessID && t.Sort >= sort);
             if (clist != null && clist.Count > 0)
             {
-                if (column != null)
-                {
-                    clist.ForEach(t => t.Sort = t.Sort + 1);
-                    perforAscolumnsRepository.UpdateRange(clist.ToArray());
-                }
-                else
-                {
-                    var exce = clist.OrderBy(t => t.Sort).FirstOrDefault().Sort - sort;
-                    if (exce > 1)
-                    {
-                        clist.ForEach(t => t.Sort = t.Sort - exce);
-                        perforAscolumnsRepository.UpdateRange(clist.ToArray());
-                    }
-                }
+                int atsort = sort;
+                clist.ForEach(t => t.Sort = atsort + 1);
+                perforAscolumnsRepository.UpdateRange(clist.ToArray());
             }
-            column = new as_columns { AssessID = assessID, ParentID = parentID, ColumnName = columnName, Sort = sort };
+            var column = new as_columns { AssessID = assessID, ParentID = parentID, ColumnName = columnName, Sort = sort };
             var result = perforAscolumnsRepository.Add(column);
             return result ? new ApiResponse(ResponseType.OK, column) : new ApiResponse(ResponseType.Fail);
         }