From cfc7a5db934b849111abb820ad6ecc8fff8ab906 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 23 十月 2024 16:42:15 +0800
Subject: [PATCH] 修改了报表
---
DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
index 80d9096..a35b756 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
@@ -10,49 +10,67 @@
{
public partial class RptPreview : DevExpress.XtraEditors.XtraForm
{
- private string _rptService;
- public RptPreview(string rptService)
+ private string _rptParameter;
+ public RptPreview(string rptParameter)
{
- _rptService = rptService;
+ _rptParameter = rptParameter;
InitializeComponent();
- this.Text = _rptService + "鎶ヨ〃鏌ョ湅锛�";
+ this.Text = _rptParameter + "鎶ヨ〃鏌ョ湅锛�";
getRptData();
}
/// <summary>
- /// 璇诲彇鎶ヨ〃鏁版嵁鍒楄〃
+ /// 璇诲彇鎶ヨ〃鏁版嵁
/// </summary>
private void getRptData()
{
var _obj = new
{
- reportType = this._rptService,
- sortName = "a.userName asc,a.roleName asc,menuActionPath ",
- sortOrder = "asc",
- keyWhere = ""
+ rptParameter = this._rptParameter,
};
try
{
- string strJson = UtilityHelper.HttpPost("", "Report/" + _rptService, 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"]["listM1"])
- {
- array.Add(a);
- }
- DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
- DataSet ds = new DataSet();
- dt.TableName = "Table2";
- 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();
--
Gitblit v1.9.3