From a0a4929a99a9d85cb38230f06244eeba65525afc Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 19 十二月 2025 17:53:05 +0800
Subject: [PATCH] 来料、首、巡检验项目排序

---
 service/QC/LljService.cs |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/service/QC/LljService.cs b/service/QC/LljService.cs
index 5d687f7..a4c295e 100644
--- a/service/QC/LljService.cs
+++ b/service/QC/LljService.cs
@@ -46,7 +46,10 @@
             .WhereIF(UtilityHelper.CheckGuid(parsedGuid),
                 a => a.guid == parsedGuid )
             .Where(a => (a.fsubmit ?? 0) == 0)
-            .OrderByDescending(a => a.CreateDate)
+        // 浣跨敤 OrderBy 鐨勫鏉′欢鎺掑簭
+        //.OrderBy(it => SqlFunc.IIF((it.fsubmit ?? 0) == 0, 0, 1))
+        .OrderBy(it => SqlFunc.IIF((it.UrgentFlag ?? 0) == 1, 0, 1))
+        .OrderByDescending(a => a.CreateDate)
             .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
 
         return (pageList, totalCount);
@@ -232,7 +235,7 @@
 GROUP BY [a].[guid], [a].[parent_guid], [a].[release_no], [a].[fac_level], [a].[fcheck_item], [a].[fcheck_tool],
          [a].[fdown_allow], [a].[fcheck_level], [a].[fstand], [a].[fup_allow], [a].[sample_size_no], [a].[fspec_requ],
          [a].[fre_qty], [a].[check_qyt], [a].[fcheck_resu], [a].[forder], [a].[ybsl]
-ORDER BY [a].[forder] ASC", releaseNo);
+ORDER BY [a].[forder] , [a].[GUID] ASC", releaseNo);
 
         var Ybsl_In = Db.Ado.SqlQuery<MesQaItemsDetectDetail5>(sql).ToList();
 

--
Gitblit v1.9.3