特殊核算组写入数据跳过公式

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -139,6 +139,7 @@ private void WriteDataToFile(IWorkbook workbook, int allotId, Dictionary<ExDataD
             for (int sheetIndex = 0; sheetIndex < workbook.NumberOfSheets; sheetIndex++)
             {
                 var sheet = workbook.GetSheetAt(sheetIndex);
+                string sheetName = sheet.SheetName.NoBlank();
 
                 ratio += 40m / workbook.NumberOfSheets;
                 var sheetType = perSheetService.GetSheetType(sheet.SheetName);
@@ -151,13 +152,14 @@ private void WriteDataToFile(IWorkbook workbook, int allotId, Dictionary<ExDataD
                 if (sheetType == SheetType.OtherWorkload) point = PerSheetDataFactory.GetDataRead(SheetType.Workload)?.Point;
 
                 if (types.Contains(sheetType) && point != null && point.DataFirstCellNum.HasValue)
+                {
+                    logger.LogInformation($"{sheetName}开始清除历史数据。point：{JsonHelper.Serialize(point)}");
                     ExtractHelper.ClearSheetPartialData(sheet, point, sheetType);
+                }
 
                 var customer = factory.GetWriteData(sheetType, logger);
                 if (customer != null)
                 {
-                    string sheetName = sheet.SheetName.NoBlank();
-
                     var collects = collectData?.Where(t => t.SheetName.NoBlank() == sheetName).ToList();
                     customer.WriteCollectData(sheet, point, sheetType, style, collects);
 

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

@@ -188,10 +188,13 @@ private void SupplySpecialQuantity(ISheet sheet, ExcelStyle style, List<SpecialD
                     if (special != null)
                     {
                         var cell = row.GetOrCreate(quantityIndex);
-                        cell.SetCellType(CellType.Numeric);
-                        cell.SetCellValue<double>(special.Quantity);
-                        cell.CellStyle = cellStyle;
 
+                        if (cell.CellType != CellType.Formula)
+                        {
+                            cell.SetCellType(CellType.Numeric);
+                            cell.SetCellValue<double>(special.Quantity);
+                            cell.CellStyle = cellStyle;
+                        }
                         specials.Remove(special);
                     }
                     dataFirstRowNum = rowIndex + 1;