From 82b0cfc162cb2734d619966956b3197ed68d6c91 Mon Sep 17 00:00:00 2001
From: Leo <novelliou@hotmail.com>
Date: Thu, 31 Aug 2023 10:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/FormulaController.cs          |  8 ++++++-
 FactorySystemBll/FormulaBll.cs                | 22 ++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/FactorySystemApi/Controllers/FormulaController.cs b/FactorySystemApi/Controllers/FormulaController.cs
index e047fd2..e73ad25 100644
--- a/FactorySystemApi/Controllers/FormulaController.cs
+++ b/FactorySystemApi/Controllers/FormulaController.cs
@@ -391,10 +391,16 @@ namespace FactorySystemApi.Controllers
             return ExceptionHelper.TryReturnException(() =>
             {
                 string formulaId = inParam["formulaId"] == null ? "-1" : inParam["formulaId"].ToString();
+                string pageIndex = inParam["pageIndex"] == null ? "-1" : inParam["pageIndex"].ToString();
+                string pageSize = inParam["pageSize"] == null ? "-1" : inParam["pageSize"].ToString();
                 int nFormulaId = 0;
+                int nPageIndex = 0;
+                int nPageSize = 0;
                 int.TryParse(formulaId, out nFormulaId);
+                int.TryParse(pageIndex, out nPageIndex);
+                int.TryParse(pageSize, out nPageSize);
 
-                List<object> formulaApplyHistory = FormulaBll.GetFormulaApplyHistory(nFormulaId);
+                List<object> formulaApplyHistory = FormulaBll.GetFormulaApplyHistory(nFormulaId, nPageIndex, nPageSize);
                 apiResult.Data = formulaApplyHistory;
             }, apiResult, Request);
         }
diff --git a/FactorySystemBll/FormulaBll.cs b/FactorySystemBll/FormulaBll.cs
index b0dd68d..e28cf7d 100644
--- a/FactorySystemBll/FormulaBll.cs
+++ b/FactorySystemBll/FormulaBll.cs
@@ -372,15 +372,27 @@ namespace FactorySystemBll
             return okCount;
         }
 
-        public List<object> GetFormulaApplyHistory(int formulaId)
+        public List<object> GetFormulaApplyHistory(int formulaId, int pageIndex, int pageSize)
         {
             SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
             List<object> formulaApplyHistory;
 
-            formulaApplyHistory = db.Queryable<TFS_FormulaApplyHistory>()
-                .Where((a) => a.FFormulaID == formulaId)
-                .Select<object>("*")
-                .ToList();
+            if (pageSize > 0)
+            {
+                formulaApplyHistory = db.Queryable<TFS_FormulaApplyHistory>()
+                    .Where((a) => a.FFormulaID == formulaId)
+                    .OrderBy(a => a.FApplyTime, OrderByType.Desc)
+                    .Select<object>("*")
+                    .ToPageList(pageIndex, pageSize);
+            }
+            else
+            {
+                formulaApplyHistory = db.Queryable<TFS_FormulaApplyHistory>()
+                    .Where((a) => a.FFormulaID == formulaId)
+                    .OrderBy(a => a.FApplyTime, OrderByType.Desc)
+                    .Select<object>("*")
+                    .ToList();
+            }
 
             return formulaApplyHistory;
         }