bug - 二次绩效自定义工作量列头未带出

performance/Performance.Services/Details/SecondAllotDetails.cs

@@ -97,9 +97,9 @@ public SecondResponse GetSecondDetails(int userId, int secondId, int hospitalId,
 
             // 历史保存过的数据
             var savedDataList = agfixatitemRepository.GetEntities(w => w.SecondId == secondAllot.Id);
-            
+
             if (secondAllot.UseTempId != null) tempId = (int)secondAllot.UseTempId;
-            
+
             var header = GetHeadItems(hospitalId, tempId, secondAllot);
 
             var body = GetBodyItems(userId, employeeSource, secondAllot, prevSecondAllot, header, savedDataList);
@@ -135,13 +135,16 @@ public List<HeadItem> GetHeadItems(int hospitalId, int tempId, ag_secondallot se
             //获取工作量、单项奖励列
             if (configHeaders != null && configHeaders.Any())
             {
-                var workDtos = Mapper.Map<List<HeadItem>>(configHeaders.Where(t => t.WorkTypeId == (int)AgWorkloadType.Workload));
-                workDtos.ForEach(t => { t.Type = (int)TempColumnType.WorkloadColumns; });
-                headItems.AddRange(workDtos);
+                foreach (var workTypeId in configHeaders.Select(t => t.WorkTypeId).Distinct())
+                {
+                    var workDtos = Mapper.Map<List<HeadItem>>(configHeaders.Where(t => t.WorkTypeId == workTypeId));
+                    int type = workTypeId == (int)AgWorkloadType.SingleAwards
+                        ? (int)TempColumnType.SingleAwardsColumns
+                        : (int)TempColumnType.WorkloadColumns;
 
-                workDtos = Mapper.Map<List<HeadItem>>(configHeaders.Where(t => t.WorkTypeId == (int)AgWorkloadType.SingleAwards));
-                workDtos.ForEach(t => { t.Type = (int)TempColumnType.SingleAwardsColumns; });
-                headItems.AddRange(workDtos);
+                    workDtos.ForEach(t => t.Type = type);
+                    headItems.AddRange(workDtos);
+                }
             }
 
             if (headItems != null && headItems.Any())