Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop

performance/Performance.EntityModels/Entity/as_columns.cs

@@ -37,6 +37,11 @@ public class as_columns
         public string ColumnName { get; set; }
     
         /// <summary>
+        /// 原始模板ID
+        /// </summary>
+        public Nullable<int> TempColumnID { get; set; }
+    
+        /// <summary>
         /// 排序
         /// </summary>
         public Nullable<int> Sort { get; set; }

performance/Performance.Services/AssessService.cs

@@ -305,11 +305,19 @@ public ApiResponse UseTemplate(int allotID, int assessID)
                     AssessID = assess.ID,
                     ParentID = t.ParentID,
                     ColumnName = t.ColumnName,
+                    TempColumnID = t.ID,
                     Sort = t.Sort
                 }).ToList();
                 //copy模版列头
                 if (result && columns != null && columns.Count > 0)
+                {
                     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());
+                    }
+                }
                 return result ? new ApiResponse(ResponseType.OK) : new ApiResponse(ResponseType.Fail);
             }
             return allot == null ? new ApiResponse(ResponseType.Fail, "绩效ID无效") : new ApiResponse(ResponseType.Fail, "模版信息不存在");