From 847e0eb00a5ae04375c196575fc2eba13bcf4bfb Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 04 九月 2025 18:16:29 +0800
Subject: [PATCH] 导出功能增加查询条件

---
 DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs |   10 ++++++++--
 DevApp/Gs.DevApp/Entity/XlsOutModel.cs |    5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
index 5a78799..4ffa9c7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
@@ -157,10 +157,16 @@
                 if (dialogResult == DialogResult.OK)
                 {
                     string _folder = folderBrowserDialog.SelectedPath;
-                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_shjh");
+                    var _params = new
+                    {
+                        orgId = ucLookOrg1.GetId(),//涓诲缓
+                        beginDate = dateEdit1.EditValue.ToString(),
+                        endDate = dateEdit2.EditValue.ToString()
+                    };
+                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_shjh","","","", _params);
                     try
                     {
-                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
+                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
                         ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                         if (_rtn.rtnCode > 0)
                         {
diff --git a/DevApp/Gs.DevApp/Entity/XlsOutModel.cs b/DevApp/Gs.DevApp/Entity/XlsOutModel.cs
index 0020481..c147979 100644
--- a/DevApp/Gs.DevApp/Entity/XlsOutModel.cs
+++ b/DevApp/Gs.DevApp/Entity/XlsOutModel.cs
@@ -9,12 +9,13 @@
         /// <param name="_outSortName">鎺掑簭瀛楁</param>
         /// <param name="_outSortOrder">鎺掑簭</param>
         public XlsOutModel(string _outParameter = "", string _outWhere = "",
-            string _outSortName = "", string _outSortOrder = "")
+            string _outSortName = "", string _outSortOrder = "", object outParams = null)
         {
             outParameter = _outParameter;
             outWhere = _outWhere;
             outSortName = _outSortName;
             outSortOrder = _outSortOrder;
+            this.outParams = outParams;
         }
 
 
@@ -28,5 +29,7 @@
 
 
         public string outSortOrder { get; set; }
+
+        public object outParams { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3