导入优化

AutoTurnOver.Utility/EPPlusHelper.cs

@@ -83,8 +83,12 @@ namespace AutoTurnOver.Utility
                         int col = workSheet.Dimension.Columns;
                         for (int j = 1; j <= col; j++)
                         {
+                            if(workSheet.Cells[1, j] != null && workSheet.Cells[1, j].Value!=null)
+                            {
                                 table.Columns.Add(workSheet.Cells[1, j].Value.ToString());
                             }
+                            
+                        }
                         for (int i = 2; i <= row; i++)
                         {
                             DataRow data_row = table.NewRow();
@@ -92,11 +96,31 @@ namespace AutoTurnOver.Utility
                             {
                                 try
                                 {
-                                    data_row[workSheet.Cells[1, j].Value.ToString()] = workSheet.Cells[i, j].Value == null ? "" : workSheet.Cells[i, j].Value.ToString();
+                                    var cell = workSheet.Cells[i, j];
+                                    if (workSheet.Cells[1, j] != null && workSheet.Cells[1, j].Value!=null)
+                                    {
+                                        if (workSheet.Cells[i, j] != null && workSheet.Cells[i, j].Value != null)
+                                        {
+                                            if (cell.Style.Numberformat.Format.IndexOf("yyyy") > -1 || (cell.Style.Numberformat.Format.IndexOf("月") > -1 && cell.Style.Numberformat.Format.IndexOf("日") > -1))
+                                            {
+                                                data_row[workSheet.Cells[1, j].Value.ToString()] = cell.GetValue<DateTime>();
                                             }
-                                catch (Exception ex)
+                                            else
                                             {
+                                                data_row[workSheet.Cells[1, j].Value.ToString()] = cell.Value;
+                                            }
+                                        }
+                                        else
+                                        {
+                                            data_row[workSheet.Cells[1, j].Value.ToString()] = "";
+                                        }
+                                        
+                                    }
                                     
+                                   
+                                }
+                                catch (Exception ex)
+                                {
                                     throw;
                                 }