From 86c6a1651795676219683797a33ae61531e769d5 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 09 八月 2025 17:01:19 +0800
Subject: [PATCH] 11

---
 MES.Service/service/QC/SJService.cs |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 6b56ca5..56acb22 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -43,6 +43,8 @@
 
         string[]? lineNo = null;
 
+        int totalCount = 0;
+
         //if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
         //    lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
 
@@ -55,14 +57,13 @@
             .WhereIF(
                 StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                 "鏈畬鎴�".Equals(queryObj.Result),
-                a => a.FSubmit == null)
+                a => a.FSubmit == "0")
             .WhereIF(
                 StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                 !"鏈畬鎴�".Equals(queryObj.Result),
-                a => a.FSubmit != null)
+                a => a.FSubmit == "1")
             .OrderBy(a => a.CreateTime, OrderByType.Desc);
-             var totalCount = data.Count();
-        var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit);
+        var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);
 
         return (items, totalCount);
     }

--
Gitblit v1.9.3