修复报告程序导出时大分类为空是数据不显示问题

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -303,9 +303,12 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     dr["TypeName"] = dt.Rows[i]["TypeName"].ToString();
                     dr["TypeId"] = dt.Rows[i]["TypeId"].ToString();
                     dr["con"] = dt.Rows[i]["con"].ToString();
-                    dr["Class"] = dt.Rows[i]["GroupName"].ToString();
+                    
                     if (dt.Rows[i]["GroupName"].ToString() == "")
-                        continue;
+                        dr["Class"] = "NULL";
+                    else
+                        dr["Class"] = dt.Rows[i]["GroupName"].ToString();
+                    //continue;
                     dr["Largest"] = Math.Round(Convert.ToDouble(dt.Rows[i]["max"]), 2);
                     for (int a = 6; a < colid.Count; a++)
                     {
@@ -1544,7 +1547,10 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             for (int i = 0; i < getClass_dt.Rows.Count; i++)
             {
                 if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid")
-                    ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                    if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
+                        ClassName.Add("NULL");
+                    else
+                        ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
             }
 
             //颗粒尺寸数据（例 1.5有多少，2.0有多少）
@@ -1784,7 +1790,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             for (int i = 0; i < getClass_dt.Rows.Count; i++)
             {
                 if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid")
-                    ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                    //ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                    if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
+                        ClassName.Add("NULL");
+                    else
+                        ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
             }
             //统计元素物质大类的元素信息和面积占比
             DataTable dt_ElementalSubstance = ElementalSubstance(AllAnalysisDetails, ClassName, fielddata);
@@ -1913,7 +1923,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             for (int i = 0; i < getClass_dt.Rows.Count; i++)
             {
                 if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid")
-                    ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                    //ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                    if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
+                        ClassName.Add("NULL");
+                    else
+                        ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
             }
 
             //统计元素物质大类的元素信息和面积占比
@@ -2678,7 +2692,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             for (int i = 0; i < getClass_dt.Rows.Count; i++)
             {
                 if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid")
-                    ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                    //ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                    if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
+                        ClassName.Add("NULL");
+                    else
+                        ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
             }
             //夹杂物面积比添加大类
             DataTable RawParticleData = InclusionAreaRatio_2(str);
@@ -2759,7 +2777,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             for (int i = 0; i < getClass_dt.Rows.Count; i++)
             {
                 if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION" && getClass_dt.Rows[i]["GroupName"].ToString() != "Invalid")
-                    ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                    //ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                    if (getClass_dt.Rows[i]["GroupName"].ToString() == "")
+                        ClassName.Add("NULL");
+                    else
+                        ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
             }
 
             DataTable AreaRatio = new DataTable();