From eb86c89d85599da5b3f237a0e1214e45f6a90225 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期三, 17 十二月 2025 16:47:37 +0800
Subject: [PATCH] 期初打印明细查询优化
---
WebApi/Gs.Sys/Services/FmController.cs | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index d3adfee..ac66794 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -253,17 +253,20 @@
string keyMeth = model.keyMeth;
string keyNo = model.keyNo;
string idtype = model.idtype;//杩欎釜浠呬粎鏄洿鏂板伐鍗曠姸鎬佺殑鏃跺�欐湁
- if (keyMeth.ToUpper() == "delete".ToUpper())
- return "";
+ string? keyList = model.keyList;//浠庡瓨鍌ㄨ繃绋嬫潵 zb/鍙彇涓昏〃鏁版嵁 mx1/鍙栨槑缁�1鐨勬暟鎹�
+
+ if (string.IsNullOrEmpty(keyList))
+ keyList = "";
+
try
{
System.Data.DataSet dset = new System.Data.DataSet();
SqlParameter[] parameters =
{
- new("@inOrderGuid", keyGuid),
- new("@inEdtUserGuid", keyUserGuid),
- new("@keyMeth", keyMeth.ToLower()),
- };
+ new("@inOrderGuid", keyGuid),
+ new("@inEdtUserGuid", keyUserGuid),
+ new("@keyMeth", keyMeth.ToLower()),
+ };
dset = DbHelperSQL.RunProcedure(keyProduce, parameters, "0");
if (dset == null)
return "";
@@ -271,24 +274,34 @@
return "";
if (dset.Tables[0].Rows.Count <= 0)
return "";
- //杩欐槸鏅�氱殑鎺ュ彛
+
+ // 鍘熸湁閫昏緫锛堥潪鐗规畩鎯呭喌锛�
if (string.IsNullOrEmpty(idtype))
{
string _mesGuid = dset.Tables[0].Rows[0][0].ToString();
dynamic _datajson = new ExpandoObject();
if (dset.Tables.Count > 1)
{
- //杩欐槸缁撴锛岀粨鏋勫拰鍏跺畠涓嶄竴鏍�
- if (keyMeth.ToLower() == "toclose".ToLower() || keyMeth.ToLower() == "closure".ToLower() || keyMeth.ToLower() == "unfinish")
- {
- _datajson = dset.Tables[1].Rows[0].RowToDynamic();
- }
- else
- {
- _datajson = dset.Tables[0].Rows[0].RowToDynamic();
- List<dynamic> _lst = dset.Tables[1].TableToDynamicList();
- ((IDictionary<string, object>)_datajson)[keyChild] = _lst;
- }
+ // 1.浠呭彇涓昏〃鏁版嵁锛屼笉澶勭悊瀛愯〃
+ if ( keyList.ToLower() == "zb".ToLower() )
+ {
+ _datajson = dset.Tables[0].Rows[0].RowToDynamic();
+ }
+ // 2.鍙栧瓙琛ㄧ涓�琛屾暟鎹�
+ else if (keyMeth.ToLower() == "toclose"
+ || keyMeth.ToLower() == "closure"
+ || keyMeth.ToLower() == "unfinish")
+ {
+ _datajson = dset.Tables[1].Rows[0].RowToDynamic();
+ }
+ // 3.鍏朵粬鎿嶄綔锛氫富琛�+瀛愯〃鎸傝浇鍒発eyChild
+ else
+ {
+ _datajson = dset.Tables[0].Rows[0].RowToDynamic();
+ List<dynamic> _lst = dset.Tables[1].TableToDynamicList();
+ ((IDictionary<string, object>)_datajson)[keyChild] = _lst;
+ }
+
}
var _obj = new
{
@@ -296,15 +309,15 @@
taskname = keyTaskName,
optype = keyMeth,
datajson = JsonConvert.SerializeObject(_datajson),
- // datajson = (_datajson),
};
return JsonConvert.SerializeObject(_obj);
}
- //杩欐槸璁㈠崟鍥炰紶鏍囪瘑
+
List<dynamic> _datajson22 = new List<dynamic>();
- dynamic _ob= new ExpandoObject();
+ dynamic _ob = new ExpandoObject();
_ob.ENTRY = dset.Tables[0].TableToDynamicList();
_datajson22.Add(_ob);
+
var _obj22 = new
{
taskname = keyTaskName,
@@ -319,6 +332,7 @@
throw ex;
}
}
+
#endregion
--
Gitblit v1.9.3