列头修改

performance/Performance.Api/Controllers/AssessController.cs

@@ -91,7 +91,7 @@ public ApiResponse ColumnList([CustomizeValidator(RuleSet = "List"), FromBody]As
         [Route("addcolumn")]
         public ApiResponse AddColumn([CustomizeValidator(RuleSet = "Add"), FromBody]AssessColumnRequest request)
         {
-            return assessService.AddColumn(request.AssessID, request.ParentID, request.ColumnName);
+            return assessService.AddColumn(request.AssessID, request.ParentID, request.ColumnName, request.Sort);
         }
 
         //修改考核项
@@ -99,7 +99,7 @@ public ApiResponse AddColumn([CustomizeValidator(RuleSet = "Add"), FromBody]Asse
         [Route("editcolumn")]
         public ApiResponse EditColumn([CustomizeValidator(RuleSet = "Update"), FromBody]AssessColumnRequest request)
         {
-            return assessService.EditColumn(request.ColumnID, request.ColumnName);
+            return assessService.EditColumn(request.ColumnID, request.ColumnName, request.Sort);
         }
 
         //删除考核项

performance/Performance.DtoModels/Request/AssessColumnRequest.cs

@@ -11,6 +11,7 @@ public class AssessColumnRequest : ApiRequest
         public int AssessID { get; set; }
         public int ParentID { get; set; }
         public string ColumnName { get; set; }
+        public int Sort { get; set; }
     }
 
     public class AssessColumnRequestValidator : AbstractValidator<AssessColumnRequest>

performance/Performance.EntityModels/Entity/as_columns.cs

@@ -35,5 +35,10 @@ public class as_columns
         /// 列头名称
         /// </summary>
         public string ColumnName { get; set; }
+    
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public Nullable<int> Sort { get; set; }
     }
 }

performance/Performance.Services/AssessService.cs

@@ -122,7 +122,7 @@ public ApiResponse SetAssessType(SetAssessRequest request)
         /// <returns></returns>
         public ApiResponse ColumnList(int assessID)
         {
-            var list = perforAscolumnsRepository.GetEntities(t => t.AssessID == assessID);
+            var list = perforAscolumnsRepository.GetEntities(t => t.AssessID == assessID).OrderBy(t => t.ParentID).ThenBy(t => t.Sort);
             return new ApiResponse(ResponseType.OK, list);
         }
 
@@ -133,7 +133,7 @@ public ApiResponse ColumnList(int assessID)
         /// <param name="parentID"></param>
         /// <param name="columnName"></param>
         /// <returns></returns>
-        public ApiResponse AddColumn(int assessID, int parentID, string columnName)
+        public ApiResponse AddColumn(int assessID, int parentID, string columnName, int sort)
         {
             var entity = perforAsassessRepository.GetEntity(t => t.ID == assessID);
             if (entity == null)
@@ -144,7 +144,7 @@ public ApiResponse AddColumn(int assessID, int parentID, string columnName)
                 if (centity == null)
                     return new ApiResponse(ResponseType.Fail, "考核项目父级ID无效");
             }
-            var column = new as_columns { AssessID = assessID, ParentID = parentID, ColumnName = columnName };
+            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);
         }
@@ -155,12 +155,13 @@ public ApiResponse AddColumn(int assessID, int parentID, string columnName)
         /// <param name="columnID"></param>
         /// <param name="columnName"></param>
         /// <returns></returns>
-        public ApiResponse EditColumn(int columnID, string columnName)
+        public ApiResponse EditColumn(int columnID, string columnName, int sort)
         {
             var entity = perforAscolumnsRepository.GetEntity(t => t.ID == columnID);
             if (entity == null)
                 return new ApiResponse(ResponseType.Fail, "考核项目父级ID无效");
             entity.ColumnName = columnName;
+            entity.Sort = sort;
             var result = perforAscolumnsRepository.Update(entity);
             return result ? new ApiResponse(ResponseType.OK, entity) : new ApiResponse(ResponseType.Fail);
         }