From bd06bb837fa0c7edeeae56cb0fe4fb844f53fb2f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 23 十月 2024 16:42:34 +0800
Subject: [PATCH] 修改了报表设计器
---
DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs | 85 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
index e9e66fc..a35b756 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
@@ -1,28 +1,8 @@
锘�
-using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraBars.Navigation;
-using DevExpress.XtraTab;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.Reflection;
-using System.Windows.Forms;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using Gs.DevApp.Entity;
using Newtonsoft.Json.Linq;
using System.IO;
@@ -30,53 +10,76 @@
{
public partial class RptPreview : DevExpress.XtraEditors.XtraForm
{
- private string _reportType;
- public RptPreview(string reportType)
+ private string _rptParameter;
+ public RptPreview(string rptParameter)
{
- _reportType = reportType;
+ _rptParameter = rptParameter;
InitializeComponent();
- getPageList();
+ this.Text = _rptParameter + "鎶ヨ〃鏌ョ湅锛�";
+ getRptData();
}
/// <summary>
- /// 璇诲彇鎶ヨ〃鏁版嵁鍒楄〃
+ /// 璇诲彇鎶ヨ〃鏁版嵁
/// </summary>
- private void getPageList()
+ private void getRptData()
{
var _obj = new
{
- reportType = _reportType,
- sortName = "a.userName",
- sortOrder = "asc",
- keyWhere = ""
+ rptParameter = this._rptParameter,
};
try
{
- string strJson = UtilityHelper.HttpPost("", "Report/GetUserRoleReport", JsonConvert.SerializeObject(_obj));
+ string strJson = UtilityHelper.HttpPost("", "Report/GetRptData", JsonConvert.SerializeObject(_obj));
JObject _job = JObject.Parse(strJson);
string rtnCode = _job["rtnCode"].ToString();
if (int.Parse(rtnCode) > 0)
{
- JArray array = new JArray();
- foreach (var a in _job["rtnData"]["list"])
- {
- array.Add(a);
- }
- DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
- DataSet ds = new DataSet();
- dt.TableName = "Table1";
- ds.Tables.Add(dt);
+ //妯℃澘
FastReport.Report report = new FastReport.Report();
- byte[] buffer = (byte[])_job["rtnData"]["reportData"];
+ byte[] buffer = (byte[])_job["rtnData"]["reportTemplateData"];
using (MemoryStream Stream = new MemoryStream(buffer))
{
report.Load(Stream);
}
+ //涓昏〃
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["zb"])
+ {
+ array.Add(a);
+ }
+ DataTable _zb = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ _zb.TableName = "zb";
+ //鏄庣粏琛�1
+ JArray array1 = new JArray();
+ foreach (var a in _job["rtnData"]["mx1"])
+ {
+ array1.Add(a);
+ }
+ DataTable _mx1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+ _mx1.TableName = "mx1";
+ //鏄庣粏琛�2
+ JArray array2 = new JArray();
+ foreach (var a in _job["rtnData"]["mx2"])
+ {
+ array1.Add(a);
+ }
+ DataTable _mx2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ _mx2.TableName = "mx2";
+ //鍔犲埌鏁版嵁闆嗕腑
+ DataSet ds = new DataSet();
+ ds.Tables.Add(_zb);
+ ds.Tables.Add(_mx1);
+ ds.Tables.Add(_mx2);
report.RegisterData(ds);
report.Preview = previewControl1;
report.Prepare();
report.ShowPrepared();
}
+ else
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _job["rtnMsg"].ToString());
+ }
}
catch (Exception ex)
{
--
Gitblit v1.9.3