二次分配结构加载，数据未加载

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -23,18 +23,21 @@ public class SecondAllotController : ControllerBase
         private readonly SecondAllotService secondAllotService;
         private readonly ResultComputeService resultComputeService;
         private readonly SecondAllotDetails secondAllotDetails;
+        private readonly RedistributionService _redistributionService;
 
         public SecondAllotController(
             ClaimService claimService,
             SecondAllotService secondAllotService,
             ResultComputeService resultComputeService,
-            SecondAllotDetails secondAllotDetails
+            SecondAllotDetails secondAllotDetails,
+            RedistributionService redistributionService
             )
         {
             this.claimService = claimService;
             this.secondAllotService = secondAllotService;
             this.resultComputeService = resultComputeService;
             this.secondAllotDetails = secondAllotDetails;
+            _redistributionService = redistributionService;
         }
 
         #region 二次绩效列表、录入数据展示，保存数据
@@ -530,5 +533,19 @@ public ApiResponse AutoCompleteBodyData([FromRoute] int secondId, SecondEmployee
             var result = secondAllotService.AutoComplete(secondId, request);
             return new ApiResponse(ResponseType.OK, result);
         }
+
+        /// <summary>
+        /// 二次绩效录入页面
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("api/second/redistribution")]
+        [HttpGet]
+        public ApiResponse Redistribution([FromRoute] SecondLoadRequest request)
+        {
+            var result = _redistributionService.Load(request.SecondId, request.ComputeMode);
+            return new ApiResponse(ResponseType.OK, result);
+        }
+
     }
 }

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -3810,24 +3810,29 @@
             数据集合
             </summary>
         </member>
-        <member name="T:Performance.DtoModels.TitleValue`1">
+        <member name="T:Performance.DtoModels.TitleValue`2">
             <summary>
             title value
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.TitleValue`1.Title">
+        <member name="P:Performance.DtoModels.TitleValue`2.Title">
             <summary>
             Title
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.TitleValue`1.Value">
+        <member name="P:Performance.DtoModels.TitleValue`2.Value">
             <summary>
             Value
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.TitleValue`1.State">
+        <member name="P:Performance.DtoModels.TitleValue`2.State">
+            <summary>
+            存储数据
+            </summary>
+        </member>
+        <member name="T:Performance.DtoModels.TitleValue`1">
             <summary>
-            1、已选，2、未选，3、已被选择
+            title value
             </summary>
         </member>
         <member name="T:Performance.DtoModels.TitleValue">

performance/Performance.DtoModels/HandsonTable.cs

@@ -6,23 +6,35 @@
 
 namespace Performance.DtoModels
 {
-    public class HandsonTable
+    public class HandsonTableBase
+    {
+        public HandsonTableBase()
+        {
+            ColHeaders = new List<string>();
+            Columns = new List<HandsonColumn>();
+            Data = new List<Dictionary<string, string>>();
+            NestedHeadersArray = new List<List<string>>();
+        }
+
+        public List<string> ColHeaders { get; set; }
+        public List<Dictionary<string, string>> Data { get; set; }
+        public List<HandsonColumn> Columns { get; set; }
+        public List<List<string>> NestedHeadersArray { get; set; }
+    }
+
+    public class HandsonTable : HandsonTableBase
     {
         private IEnumerable<collect_permission> _permissions;
-        private List<Dictionary<string, string>> _data;
 
         public HandsonTable(int sheetType, string[] cols, List<collect_permission> permissions)
+            : base()
         {
             _permissions = permissions;
-            _data = new List<Dictionary<string, string>>();
 
             InitColHeaders(sheetType, cols);
             InitColumns(permissions);
         }
 
-        public string[] ColHeaders { get; private set; }
-        public List<Dictionary<string, string>> Data => _data;
-        public HandsonColumn[] Columns { get; private set; }
 
         /// <summary>
         ///
@@ -43,7 +55,7 @@ public void SetRowData(IEnumerable<HandsonRowData> datas, bool isTypein)
                     else if (dic.ContainsKey(item.Name.ToLower()) && _permissions.Any(w => w.HeadName.ToLower() == item.Name.ToLower()))
                         dic[item.Name.ToLower()] = item.Value?.ToString() ?? "";
                 }
-                _data.Add(dic);
+                Data.Add(dic);
             }
         }
 
@@ -68,7 +80,7 @@ private void InitColHeaders(int sheetType, string[] cols)
                 if (!_permissions.Any(w => w.HeadName.ToLower() == item && w.Visible == 1))
                     necessitys.Remove(item);
             }
-            ColHeaders = necessitys.ToArray();
+            ColHeaders = necessitys;
         }
 
         private void InitColumns(List<collect_permission> permissions)
@@ -80,7 +92,7 @@ private void InitColumns(List<collect_permission> permissions)
                 var readnoly = _permissions.FirstOrDefault(f => f.HeadName == item)?.Readnoly == 1;
                 columns.Add(new HandsonColumn(item.ToLower(), readnoly));
             }
-            Columns = columns.ToArray();
+            Columns = columns;
         }
 
         private Dictionary<string, string> CreateDataRow(string key, string value)
@@ -124,7 +136,7 @@ public HandsonColumn(string data, bool readOnly = false, DataFormat format = Dat
         public bool ReadOnly { get; set; }
         public string Type { get; set; }
         public string[] Source { get; set; }
-        
+
         public bool Strict { get; set; } = false;
         public NumericFormat NumericFormat { get; set; }
     }

performance/Performance.DtoModels/Request/SecondEmpRequest.cs

@@ -5,6 +5,14 @@
 
 namespace Performance.DtoModels
 {
+    public class SecondLoadRequest
+    {
+        public int SecondId { get; set; }
+        /// <summary>
+        /// 计算方式：1 不计算 2 横向计算 3 纵向计算
+        /// </summary>
+        public int ComputeMode { get; set; }
+    }
     public class SecondEmployeeRequest
     {
         public string EmployeeName { get; set; }

performance/Performance.DtoModels/TitleValue.cs

@@ -7,7 +7,7 @@ namespace Performance.DtoModels
     /// <summary>
     /// title value
     /// </summary>
-    public class TitleValue<T>
+    public class TitleValue<TV, TS>
     {
         /// <summary>
         /// Title
@@ -16,11 +16,17 @@ public class TitleValue<T>
         /// <summary>
         /// Value
         /// </summary>
-        public T Value { get; set; }
+        public TV Value { get; set; }
         /// <summary>
-        /// 1、已选，2、未选，3、已被选择
+        /// 存储数据
         /// </summary>
-        public int State { get; set; }
+        public TS State { get; set; }
+    }
+    /// <summary>
+    /// title value
+    /// </summary>
+    public class TitleValue<T> : TitleValue<T, int>
+    {
     }
     /// <summary>
     /// title value