From cc0001e3a23d411065566fcc0a3ca8065b64b592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Wed, 18 Sep 2024 17:39:18 +0800
Subject: [PATCH] 1

---
 ZR.Service/mes/qc/QCStatisticsService.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ZR.Service/mes/qc/QCStatisticsService.cs b/ZR.Service/mes/qc/QCStatisticsService.cs
index 1ccdc9ec..9db17301 100644
--- a/ZR.Service/mes/qc/QCStatisticsService.cs
+++ b/ZR.Service/mes/qc/QCStatisticsService.cs
@@ -72,9 +72,10 @@ namespace ZR.Service.mes.qc
             List<QcQualityStatisticsFirst> data = Context
                 .Queryable<QcQualityStatisticsFirst>()
                 .Where(predicate)
-                .OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc)
+                
                 .OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
                 .OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
+                .OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc)
                 .OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
                 .OrderBy(it => it.WorkorderId)
                 .OrderBy(it => it.Remark2)
@@ -155,9 +156,9 @@ namespace ZR.Service.mes.qc
             List<QcQualityStatisticsAgain> data = Context
                 .Queryable<QcQualityStatisticsAgain>()
                 .Where(predicate)
-                .OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc)
                 .OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
                 .OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
+                .OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc)
                 .OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
                 .OrderBy(it => it.WorkorderId)
                 .OrderBy(it => it.Remark2)
@@ -238,9 +239,9 @@ namespace ZR.Service.mes.qc
             List<QcQualityStatisticsFinal> data = Context
                 .Queryable<QcQualityStatisticsFinal>()
                 .Where(predicate)
-                .OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc)
                 .OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
                 .OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
+                .OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc)
                 .OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
                 .OrderBy(it => it.WorkorderId)
                 .OrderBy(it => it.Remark2)
@@ -321,9 +322,9 @@ namespace ZR.Service.mes.qc
             List<QcQualityStatisticsTotal> data = Context
                 .Queryable<QcQualityStatisticsTotal>()
                 .Where(predicate)
-                .OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc)
                 .OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc)
                 .OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc)
+                .OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc)
                 .OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc)
                 .OrderBy(it => it.WorkorderId)
                 .OrderBy(it => it.Remark2)