Merge branch 'release/v20210625绩效划拨二次分配合并' of…

Merge branch 'release/v20210625绩效划拨二次分配合并' of http://gitlab.suvalue.com/zry/performance into release/v20210625绩效划拨二次分配合并

performance/Performance.Services/ExtractExcelService/SheetDataWrite/CostTransferDataWrite.cs

@@ -9,7 +9,7 @@
 
 namespace Performance.Services.ExtractExcelService.SheetDataWrite
 {
-    public class CostTransferDataWrite:IAutoInjection
+    public class CostTransferDataWrite : IAutoInjection
     {
         private readonly ILogger logger;
         private readonly PerforCosttransferRepository costtransferRepository;
@@ -35,15 +35,15 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, ExcelStyle style,
         {
             try
             {
+                var columns = SupplySheetHeader(sheet, point, style);
+                if (columns == null || !columns.Any()) return;
+
                 var costTransfers = costtransferRepository.GetEntities(t => t.AllotId == allotId);
                 if (costTransfers == null || !costTransfers.Any()) return;
 
                 var costTransferItems = costtransferitemRepository.GetEntities(t => costTransfers.Select(c => c.Id).Contains(t.TransferId) && t.Status == 1 && t.AdminStatus == 1 && t.IsWrited == 0);
                 if (costTransferItems == null || !costTransferItems.Any()) return;
 
-                var columns = SupplySheetHeader(sheet, point);
-                if (columns == null || !columns.Any()) return;
-
                 var departments = costTransfers.Select(t => t.AdoptedDepartment ?? "").Union(costTransfers.Select(t => t.ApplicantDepartment ?? "")).Distinct().ToList();
 
                 var cellStyle = style.SetBgkColorAndFormat(style.GetCellStyle(), StyleType.数据);
@@ -62,7 +62,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, ExcelStyle style,
             }
         }
 
-        private Dictionary<string, int> SupplySheetHeader(ISheet sheet, PerSheetPoint point)
+        private Dictionary<string, int> SupplySheetHeader(ISheet sheet, PerSheetPoint point, ExcelStyle style)
         {
             Dictionary<string, int> pairs = new Dictionary<string, int>();
             var header = sheet.GetRow(point.HeaderFirstRowNum.Value);
@@ -84,11 +84,13 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, ExcelStyle style,
 
             if (fixedColumns != null && fixedColumns.Any())
             {
-                var index = header.LastCellNum + 1;
+                var cellStyle = style.SetBgkColorAndFormat(style.GetCellStyle(), StyleType.列头);
+                var index = header.LastCellNum;
                 foreach (var column in fixedColumns)
                 {
                     var cell = header.CreateCell(index);
                     cell.SetCellValue(column);
+                    cell.CellStyle = cellStyle;
 
                     if (!pairs.ContainsKey(column))
                         pairs.Add(column, index);