From 82b57de13d9449c48944db91d7f17b477169c324 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期四, 16 四月 2026 19:51:40 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/QC_ManagementController.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index 84426ee..a4ea8b0 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -131,13 +131,15 @@
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn($@"select * from h_v_Gy_QCCheckProjectList_Main order by 鏃ユ湡 desc,鍗曟嵁鍙� DESC
- offset {(page-1)*size} rows fetch {size} rows only
+ offset {(page-1)*size} rows fetch next {size} rows only
+ select count(1) [count] from h_v_Gy_QCCheckProjectList_Main
", "h_v_Gy_QCCheckProjectList_Main");
}
else
{
string sql1 = "select * from h_v_Gy_QCCheckProjectList_Main where 1=1";
- string sql = sql1 + sWhere + $" order by 鏃ユ湡 desc,鍗曟嵁鍙� DESC offset {(page-1)*size} rows fetch {size} rows only ";
+ string sql = sql1 + sWhere + $@" order by 鏃ユ湡 desc,鍗曟嵁鍙� DESC offset {(page-1)*size} rows fetch next {size} rows only
+ select count(1) [count] from h_v_Gy_QCCheckProjectList_Main where 1=1 " + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList_Main");
}
}
@@ -149,7 +151,10 @@
objJsonResult.data = null;
return objJsonResult;
}
- return GetObjectJson(ds);
+
+ var jsonObj = GetObjectJson(ds) as json;
+ jsonObj.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ return jsonObj;
}
--
Gitblit v1.9.1