Commit 5494db62 by lcx

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

parent 97511089
...@@ -135,14 +135,17 @@ public List<HeadItem> GetHeadItems(int hospitalId, int tempId, ag_secondallot se ...@@ -135,14 +135,17 @@ public List<HeadItem> GetHeadItems(int hospitalId, int tempId, ag_secondallot se
//获取工作量、单项奖励列 //获取工作量、单项奖励列
if (configHeaders != null && configHeaders.Any()) if (configHeaders != null && configHeaders.Any())
{ {
var workDtos = Mapper.Map<List<HeadItem>>(configHeaders.Where(t => t.WorkTypeId == (int)AgWorkloadType.Workload)); foreach (var workTypeId in configHeaders.Select(t => t.WorkTypeId).Distinct())
workDtos.ForEach(t => { t.Type = (int)TempColumnType.WorkloadColumns; }); {
headItems.AddRange(workDtos); 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 = type);
workDtos.ForEach(t => { t.Type = (int)TempColumnType.SingleAwardsColumns; });
headItems.AddRange(workDtos); headItems.AddRange(workDtos);
} }
}
if (headItems != null && headItems.Any()) if (headItems != null && headItems.Any())
headItems = headItems.OrderBy(s => s.Type).ThenBy(s => s.Sort).ToList(); headItems = headItems.OrderBy(s => s.Type).ThenBy(s => s.Sort).ToList();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment