清除大分类后的无效代码

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -114,7 +114,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         #region 一次性读取数据所需要的数据
         public bool GetDBData()
         {
-            //DataTable bt_DBData = new DataTable();
+            m_bt_DBData.Clear();
+            m_bt_DBData.Columns.Clear();
             ParticleData fielddata = new ParticleData(m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.GetWorkingResult()].FilePath);
             List<string> colid = new List<string>() { "TypeName", "ar", "TypeId", "Largest", "Class", "con" };
             //获取粒级表
@@ -839,7 +840,13 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 DataTable getClass_dt = fielddata.GetAllClass();
                 for (int i = 0; i < getClass_dt.Rows.Count; i++)
                 {
-                    ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                    if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION")
+                        ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                }
+                for (int i = 0; i < getClass_dt.Rows.Count; i++)
+                {
+                    if (getClass_dt.Rows[i]["GroupName"].ToString() == "NOT_INCLUTION")
+                        ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
                 }
                 //获取大分类信息
                 DataTable dt = QuantityOfIntegratedSubstances(ls_Particel_dt, ClassName);
@@ -1112,7 +1119,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             //根据sql条件，查询获取颗粒信息数据
             ParticleData fielddata = new ParticleData(m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.GetWorkingResult()].FilePath);
-            //DataTable AreaInformationOfAllElements = fielddata.GetAreaByAllIncA("");//获取所有分类面积和数量信息
+          
             DataTable AllAnalysisDetails = new DataTable();
             AllAnalysisDetails.TableName = "ElementValue";
             AllAnalysisDetails.Columns.Add("Name");
@@ -1132,9 +1139,15 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             //按照list列表进行物质类排序，物质类中的元素分类按照面积的大小进行排序
             List<string> ClassName = new List<string>();
             DataTable getClass_dt= fielddata.GetAllClass();
-            for (int i=0;i< getClass_dt.Rows.Count;i++)
+            for (int i = 0; i < getClass_dt.Rows.Count; i++)
             {
-                ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+                if (getClass_dt.Rows[i]["GroupName"].ToString() != "NOT_INCLUTION")
+                    ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
+            }
+            for (int i = 0; i < getClass_dt.Rows.Count; i++)
+            {
+                if (getClass_dt.Rows[i]["GroupName"].ToString() == "NOT_INCLUTION")
+                    ClassName.Add(getClass_dt.Rows[i]["GroupName"].ToString());
             }
             //统计元素物质大类的元素信息和面积占比
             DataTable dt_ElementalSubstance=  ElementalSubstance(AllAnalysisDetails, ClassName, fielddata);
@@ -1647,7 +1660,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         {
             //加载模块
             m_otsreport_export.m_ReportApp.im_EChart_ParticlesComposition = new EChart_ParticlesComposition(m_otsreport_export.m_ReportApp, "InclusionareaClassRatio");
-            m_otsreport_export.m_ReportApp.m_reportname = "夹杂物质面积比";
+            m_otsreport_export.m_ReportApp.m_reportname = "";
             m_otsreport_export.m_ReportApp.type = a_GraphicStyle;
             m_otsreport_export.m_ReportApp.timerKG = true;
             m_otsreport_export.m_ReportApp.m_ChartsWindow.Controls.Add(m_otsreport_export.m_ReportApp.im_EChart_ParticlesComposition);
@@ -1688,7 +1701,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         {
             //加载模块
             m_otsreport_export.m_ReportApp.im_EChart_ParticlesComposition = new EChart_ParticlesComposition(m_otsreport_export.m_ReportApp, "InclusionareaRatio");
-            m_otsreport_export.m_ReportApp.m_reportname = "夹杂物面积比";
+            m_otsreport_export.m_ReportApp.m_reportname = "";
             m_otsreport_export.m_ReportApp.type = a_GraphicStyle;
             m_otsreport_export.m_ReportApp.timerKG = true;
             m_otsreport_export.m_ReportApp.m_ChartsWindow.Controls.Add(m_otsreport_export.m_ReportApp.im_EChart_ParticlesComposition);