优化

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -552,9 +552,9 @@ public ApiResponse RedistributionLoad([FromBody] SecondLoadDto request)
             if (!Enum.IsDefined(typeof(ComputeMode), request.ComputeMode))
                 throw new PerformanceException("暂不支持当前计算方式！");
 
-            var overrideMode = OverrideMode.Initial;
-            if (Enum.IsDefined(typeof(OverrideMode), request.OverrideMode))
-                overrideMode = (OverrideMode)request.OverrideMode;
+            var overrideMode = EmployeeSource.Initial;
+            if (Enum.IsDefined(typeof(EmployeeSource), request.OverrideMode))
+                overrideMode = (EmployeeSource)request.OverrideMode;
 
             var result = _redistributionService.Load(request.SecondId, (ComputeMode)request.ComputeMode, overrideMode);
             return new ApiResponse(ResponseType.OK, result);

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

@@ -3781,26 +3781,6 @@
             纵向计算
             </summary>
         </member>
-        <member name="T:Performance.DtoModels.Second.OverrideMode">
-            <summary>
-            人员带出方式 已保存，上次，字典，测算表
-            </summary>
-        </member>
-        <member name="F:Performance.DtoModels.Second.OverrideMode.Initial">
-            <summary>
-            初始化(用户保存后的数据)
-            </summary>
-        </member>
-        <member name="F:Performance.DtoModels.Second.OverrideMode.PrevSecondAllot">
-            <summary>
-            上一个二次绩效记录
-            </summary>
-        </member>
-        <member name="F:Performance.DtoModels.Second.OverrideMode.EmployeeDict">
-            <summary>
-            人员字典
-            </summary>
-        </member>
         <member name="P:Performance.DtoModels.SecondLoadDto.ComputeMode">
             <summary>
             计算方式：1 不计算 2 横向计算 3 纵向计算

performance/Performance.DtoModels/Second/Constant.cs

@@ -12,34 +12,14 @@ public enum ComputeMode
         /// <summary>
         /// 不计算
         /// </summary>
-        NotCalculate = 1,
+        NotCalculate = 11,
         /// <summary>
         /// 横向计算
         /// </summary>
-        Horizontal = 2,
+        Horizontal = 12,
         /// <summary>
         /// 纵向计算
         /// </summary>
-        Vertical = 3,
-    }
-    /// <summary>
-    /// 人员带出方式 已保存，上次，字典，测算表
-    /// </summary>
-    public enum OverrideMode
-    {
-        /// <summary>
-        /// 初始化(用户保存后的数据)
-        /// </summary>
-        Initial = 0,
-
-        /// <summary>
-        /// 上一个二次绩效记录
-        /// </summary>
-        PrevSecondAllot = 1,
-
-        /// <summary>
-        /// 人员字典
-        /// </summary>
-        EmployeeDict = 2,
+        Vertical = 13,
     }
 }

performance/Performance.DtoModels/Second/SecondColumnDictionary.cs

@@ -5,20 +5,24 @@ public class SecondColumnDictionary
         public string Label { get; set; }
         public string Key { get; set; }
         public bool IsTrue { get; set; }
+        public string Fixed { get; set; }
         public int Sort { get; set; }
         public string Site { get; set; }
+        public string Type { get; set; }
 
         public SecondColumnDictionary()
         {
         }
 
-        public SecondColumnDictionary(string label, string key, bool isTrue, int sort, string site = "Table")
+        public SecondColumnDictionary(string label, string key, bool isTrue, int sort, string site = "Table", string fix = "", string type = "")
         {
             Label = label;
             Key = key;
             IsTrue = isTrue;
             Sort = sort;
             Site = site;
+            Fixed = fix;
+            Type = type;
         }
     }
 }