From ff9ed3c4bec30fb6a9caedb5350b83703a515723 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 21 二月 2025 08:18:29 +0800
Subject: [PATCH] 11

---
 StandardPda/MES.Service/service/QC/LljService.cs |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index 5e571dc..22a172b 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -27,20 +27,27 @@
 
         var itemIds = GetQaItem(db, queryObj.createUser);
 
-        var pageList = db.Queryable<LtsLlj>()
+        var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser>((a, b, c) =>
+                new JoinQueryInfos(JoinType.Inner, a.ItemId == b.ItemId,
+                    JoinType.Inner, b.Sid == c.Fid
+                ))
             .WhereIF(
                 StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                 "鏈畬鎴�".Equals(queryObj.result),
-                a => a.FcheckResu == null)
+                (a, b, c) => a.FcheckResu == null)
             .WhereIF(
                 StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                 !"鏈畬鎴�".Equals(queryObj.result),
-                a => a.FcheckResu != null)
+                (a, b, c) => a.FcheckResu != null)
             .WhereIF(
                 itemIds is { Length: > 0 },
-                a => itemIds.Contains(a.ItemId))
-            .WhereIF(id > 0, a => a.Id == id)
-            .OrderByDescending(a => a.Id)
+                (a, b, c) => itemIds.Contains(a.ItemId))
+            .WhereIF(id > 0, (a, b, c) => a.Id == id)
+            .OrderByDescending((a, b, c) => a.Id)
+            .Select((a, b, c) => new LtsLlj
+            {
+                UserName = c.Fname
+            }, true)
             .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
 
         return (pageList, totalCount);

--
Gitblit v1.9.3