Merge branch 'feature/debug' into feature/new_report

performance/Performance.Services/PerExcelService/NopiSevice.cs

@@ -10,6 +10,29 @@ namespace Performance.Services
 {
     public class NopiSevice
     {
+        public static string GetCellStringValue(ICell cell)
+        {
+            if (cell != null)
+            {
+                try
+                {
+                    switch (cell.CellType)
+                    {
+                        case CellType.Numeric:
+                            return cell.NumericCellValue.ToString();
+                        case CellType.String:
+                            return cell.StringCellValue.ToString();
+                        case CellType.Formula:
+                            return cell.NumericCellValue.ToString();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    //throw ex;
+                }
+            }
+            return null;
+        }
         public static decimal? GetCellValue(ICell cell)
         {
             if (cell != null)

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadIncome.cs

@@ -73,8 +73,8 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
                         {
                             RowNumber = r,
                             SignID = athead.SignID,
-                            AccountingUnit = row.GetCell(unit.AccountingUnitCellNum.Value)?.StringCellValue,
-                            Department = row.GetCell(unit.DeptCellNum.Value)?.StringCellValue,
+                            AccountingUnit = NopiSevice.GetCellStringValue(row.GetCell(unit.AccountingUnitCellNum.Value)),
+                            Department = NopiSevice.GetCellStringValue(row.GetCell(unit.DeptCellNum.Value)),
                             TypeName = athead?.CellValue,
                             CellValue = cellValue,
                             Annotation = row.GetCell(athead.PointCell)?.CellComment?.String?.String,