二次绩效，显示自定义工作量；抽取文件默认为上传的文件类型

performance/Performance.Services/Details/SecondAllotDetails.cs

@@ -133,13 +133,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())

performance/Performance.Services/ExtractExcelService/ExtractHelper/ExtractHelper.cs

@@ -36,7 +36,7 @@ private static (string TempPath, string FilePath) CopyOriginalFile(int hospitalI
             FileHelper.CreateDirectory(dpath);
             string tempPath = Path.Combine(dpath, $"Template{DateTime.Now.ToString("yyyyMMddHHmmssfff")}{ext}");
             FileHelper.Copy(originalPath, tempPath);
-            string filePath = Path.Combine(dpath, $"绩效提取数据{DateTime.Now.ToString("yyyyMMddHHmmssfff")}.xls");
+            string filePath = Path.Combine(dpath, $"绩效提取数据{DateTime.Now.ToString("yyyyMMddHHmmssfff")}{ext}");
             return (tempPath, filePath);
         }
 
@@ -109,4 +109,4 @@ public static void ClearSheetPartialData(ISheet sheet, PerSheetPoint point, Shee
             }
         }
     }
-}
\ No newline at end of file
+}