From 09cb3ccb6891eba2d6c1e6ab58d34b35c2298563 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期五, 05 九月 2025 13:13:47 +0800
Subject: [PATCH] 优化

---
 StandardInterface/MES.Service/service/QC/LljService.cs |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index 37567ba..e907f30 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -1,5 +1,6 @@
 锘縰sing System.Data;
 using System.Xml;
+using System.Linq;
 using Masuit.Tools;
 using MES.Service.DB;
 using MES.Service.Dto.service;
@@ -24,6 +25,7 @@
 
         var totalCount = 0;
 
+        // 浣跨敤鏁版嵁搴撳垎椤垫煡璇紝涓�娆℃煡璇�50鏉★紝鎻愬崌鎬ц兘
         var pageList = db.Queryable<LtsLlj, V_LljUser>((a, v) =>
                 new JoinQueryInfos(JoinType.Left, a.ItemNo == v.ItemNo))
             .WhereIF(
@@ -86,9 +88,15 @@
                 // 娣诲姞鎵�灞炶溅闂�
                 SSCJ = a.SSCJ,
                 // 娣诲姞璇勫鐘舵��
-                PSZT = a.PSZT
+                PSZT = a.PSZT,
+                // 娣诲姞妫�楠岄」鐩淮鎶ょ姸鎬�
+                Jyxm = a.Jyxm
             })
-            .OrderBy("CASE WHEN EMERGENCY = 1 AND STATUS = '鏈彁浜�' THEN 0 ELSE 1 END, CASE WHEN STATUS = '鏈彁浜�' AND (SELECT COUNT(*) FROM MES_QA_ITEMS_DETECT_DETAIL5 WHERE RELEASE_NO = A.RELEASE_NO) = 0 THEN 0 ELSE 1 END, CASE WHEN STATUS = '鏈彁浜�' THEN A.CREATE_DATE ASC ELSE NULL END, CASE WHEN STATUS = '宸叉彁浜�' THEN A.IQC_DATE DESC ELSE NULL END")
+            .OrderBy("CASE WHEN EMERGENCY = 1 THEN 0 ELSE 1 END")
+            .OrderBy("CASE WHEN JYXM = 0 THEN 0 ELSE 1 END")
+            .OrderBy("CASE WHEN STATUS = '宸叉彁浜�' THEN 1 ELSE 0 END")
+            .OrderBy("IQC_DATE DESC")
+            .OrderBy("CREATE_DATE")
             .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
 
         // 鎵归噺鑾峰彇妫�楠岄」鐩暟閲忥紝閬垮厤N+1鏌ヨ闂

--
Gitblit v1.9.3