Commit d1c1322b by lcx

绩效抽取新增列时,起始index+1

parent 7bd939ad
......@@ -53,6 +53,7 @@ public static void WriteSheetHeader(ISheet sheet, PerSheetPoint point, SheetType
: style.SetBgkColorAndFormat(style.GetCellStyle(), StyleType.系数, CellFormat.百分比);
var columnStyle = style.SetBgkColorAndFormat(style.GetCellStyle(), StyleType.列头);
headerFirstCellNum += 1;
// 补充excel中不存在的列
foreach (var item in columns)
{
......@@ -368,4 +369,4 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
#endregion CollectData
}
}
\ No newline at end of file
}
......@@ -44,13 +44,14 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
if (data is List<ExtractTransDto> extractDto && extractDto.Any())
{
var headers = extractDto.Select(t => new ExcelHeader
{
ColumnName = t.Category.Trim(),
DoctorFactor = 0,
NurseFactor = 0,
TechnicianFactor = 0
}).ToList();
var headers = extractDto.Select(t => t.Category.Trim()).Distinct()
.Select(t => new ExcelHeader
{
ColumnName = t,
DoctorFactor = 0,
NurseFactor = 0,
TechnicianFactor = 0
}).ToList();
WriteDataHelper.WriteSheetHeader(sheet, point, sheetType, style, headers);
var columns = headers.Select(t => t.ColumnName).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