From 7aa34c316327694132c364ea07532d7b3760d7e8 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期五, 18 二月 2022 17:17:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/App_Data/MssqlReportData.cs |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index d054753..82e57b0 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -172,6 +172,15 @@
         QueryList.Add(new ReportQueryItem(ParameterQuerySQL, "Master"));
         GenMultiRecordset(DataPage, QueryList);
     }
+    public static void GenEntireData1(System.Web.UI.Page DataPage, System.Collections.Generic.List<ReportQueryItem> SqlList)
+    {
+        ArrayList QueryList = new ArrayList();
+        for (int i = 0; i < SqlList.Count; i++)
+        {
+            QueryList.Add(new ReportQueryItem(SqlList[i].QuerySQL, SqlList[i].RecordsetName));
+        }
+        GenMultiRecordset(DataPage, QueryList);
+    }
     public static void GenEntireData(System.Web.UI.Page DataPage, string RecordsetQuerySQL, string ParameterQuerySQL)
     {
         GenEntireData(DataPage, RecordsetQuerySQL, ParameterQuerySQL, ReportDataBase.DefaultDataType);

--
Gitblit v1.9.1