清理 将所有0赋空

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -575,6 +575,8 @@ public ApiResponse RedistributionLoad([FromBody] SecondLoadDto request)
                     overrideMode = (EmployeeSource)request.OverrideMode;
 
                 var result = _redistributionService.Load(request.SecondId, (ComputeMode)request.ComputeMode, overrideMode);
+                _redistributionService.ClearInvalidValue(result.Body?.Data);
+
                 return new ApiResponse(ResponseType.OK, result);
             }
             catch (PerformanceException ex)
@@ -702,6 +704,7 @@ public ApiResponse RedistributionCompute([FromBody] SecondComputeDto request)
                 // 重算部分数据
                 _redistributionService.RedistributionCompute((ComputeMode)request.ComputeMode, request.Head, cleanDatas);
 
+                _redistributionService.ClearInvalidValue(cleanDatas);
                 var dic = _redistributionService.GetTableHeaderDictionary((ComputeMode)request.ComputeMode, allot, second, loads, workloadGroups);
                 return new ApiResponse(ResponseType.OK, new { Head = request.Head, Body = cleanDatas, Dic = dic });
             }

performance/Performance.Services/RedistributionService.cs

@@ -14,6 +14,7 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.Linq.Expressions;
+using System.Text.RegularExpressions;
 
 namespace Performance.Services
 {
@@ -401,6 +402,30 @@ public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode compute
         }
 
         /// <summary>
+        /// 清理 将所有0赋空
+        /// </summary>
+        /// <param name="datas"></param>
+        public void ClearInvalidValue(List<Dictionary<string, object>> datas)
+        {
+            if (datas != null)
+            {
+                foreach (var row in datas)
+                {
+                    foreach (var key in row.Keys.ToArray())
+                    {
+                        if (key.StartsWithIgnoreCase("SingleAwards_")
+                            || key.StartsWithIgnoreCase("Workload_"))
+                        {
+                            var value = row[key]?.ToString() ?? "";
+                            if (value == "0" || Regex.IsMatch(value, "^0.[0]+$"))
+                                row[key] = "";
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
         /// 按指定方式加载人员数据
         /// </summary>
         /// <param name="allot"></param>