From 5c2991456d91a0fd236452bec2581ca50f9a48e2 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 21 二月 2025 14:53:01 +0800
Subject: [PATCH] Llj接口添加CreateUserName字段返回

---
 StandardPda/MES.Service/service/QC/LljService.cs |   11 +++++++----
 StandardPda/MES.Service/Modes/LtsLlj.cs          |    4 ++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/StandardPda/MES.Service/Modes/LtsLlj.cs b/StandardPda/MES.Service/Modes/LtsLlj.cs
index 4e3d9d1..ef25554 100644
--- a/StandardPda/MES.Service/Modes/LtsLlj.cs
+++ b/StandardPda/MES.Service/Modes/LtsLlj.cs
@@ -175,4 +175,8 @@
     /// 鐗╂枡鏍囪瘑锛�0锛氶潪棣栨銆�1锛氶娆★級
     /// </summary>
     [SugarColumn(IsIgnore = true)] public int? FIRST { get; set; }
+    /// <summary>
+    /// 鍒涘缓浜�
+    /// </summary>
+    [SugarColumn(IsIgnore = true)] public string? CreateUserName { get; set; }
 }
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index d625b60..e0dda16 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -27,9 +27,11 @@
 
         var itemIds = GetQaItem(db, queryObj.createUser);
 
-        var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser, VMesQaItemsDetect01>((a, b, c,d) =>
+        var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser, VMesQaItemsDetect01, SysUser>((a, b, c,d,e) =>
                 new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
-                    JoinType.Left, b.Sid == c.Fid,JoinType.Inner, a.Id == d.Id
+                    JoinType.Left, b.Sid == c.Fid,
+                    JoinType.Inner, a.Id == d.Id,
+                     JoinType.Left, a.CreateBy == e.Fcode
                 ))
             .WhereIF(
                 StringUtil.IsNotNullOrEmpty(queryObj.result) &&
@@ -44,10 +46,11 @@
                 (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, d) => new LtsLlj
+            .Select((a, b, c, d,e) => new LtsLlj
             {
                 UserName = c.Fname,
-                FIRST=d.First
+                FIRST=d.First,
+                CreateUserName=e.Fname
             }, true)
             .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
 

--
Gitblit v1.9.3