合并wuzhou

performance/Performance.Services/RedistributionService.cs

@@ -281,8 +281,8 @@ public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode compute
                 {
                     var headDynamic = _agworktypesourceRepository.GetEntities(t => t.SecondId == second.Id) ?? new List<ag_worktype_source>();
                     var groupDatas = headDynamic
-                          .GroupBy(w => new { w.WorkTypeId, w.SecondId, w.FieldId, w.FieldName })
-                          .Select(w => w.OrderByDescending(w => w.Id).FirstOrDefault());
+                        .GroupBy(w => new { w.WorkTypeId, w.SecondId, w.FieldId, w.FieldName })
+                        .Select(w => w.OrderByDescending(w => w.Id).FirstOrDefault());
                     foreach (var item in groupDatas.OrderBy(t => t.Id))
                     {
                         maps.Add(new SecondColumnDictionary(item.FieldName, item.FieldId, true, 1, "Top", isNumber: true));
@@ -328,7 +328,7 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
                 foreach (var row in rows)
                 {
                     var number = row.GetString(nameof(ag_bodysource.WorkNumber));
-            
+
                     Dictionary<string, object> pairs = new Dictionary<string, object>();
 
                     var emp = employees.FirstOrDefault(w => w.PersonnelNumber == number);
@@ -436,7 +436,6 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
             head.AddOrUpdate(nameof(second.UnitType), second.UnitType);
             head.AddOrUpdate(nameof(ComputeMode), computeMode);
             head.AddOrUpdate("ComputeModeDescription", EnumHelper.GetDescription(computeMode));
-
             var allotStates = new int[] { (int)AllotStates.绩效下发, (int)AllotStates.归档 };
             head.AddOrUpdate(nameof(ag_headsource.SecondId), second.Id);
             head.AddOrUpdate(nameof(ag_headsource.PaymentOfTheMonth), $"{allot.Year}年{allot.Month.ToString().PadLeft(2, '0')}月");
@@ -474,9 +473,14 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
                 // 已提交
                 if (second.Status.HasValue && status.Contains(second.Status.Value))
                 {
-                    foreach (var item in headDynamic.Where(w => w.FieldId.StartsWithIgnoreCase("Workload_Ratio_")).OrderBy(t => t.Id))
+                    var groupDatas = headDynamic
+                        .Where(w => w.FieldId.StartsWithIgnoreCase("Workload_Ratio_"))
+                        .GroupBy(w => new { w.WorkTypeId, w.SecondId, w.FieldId, w.FieldName })
+                        .Select(w => new { w.Key.FieldId, Value = w.OrderByDescending(w => w.Id).FirstOrDefault()?.Value ?? 0 });
+
+                    foreach (var item in groupDatas)
                     {
-                        head.AddOrUpdate(item.FieldId, item.Value ?? 0);
+                        head.AddOrUpdate(item.FieldId, item.Value);
                     }
                 }
                 // 未提交