From 62751e74a70b6f1ca848e0f5fdb6fb8922d99f38 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 20 三月 2025 12:01:26 +0800
Subject: [PATCH] 冒泡排序
---
项目代码/WIDESEAWCS_Server 正式/SerialPortService/PutakeServer.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
index 58ea3a3..bcc052d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/SerialPortService/PutakeServer.cs"
@@ -35,7 +35,7 @@
OrderByParameters = new Dictionary<string, SqlSugar.OrderByType>
{
{ nameof(Dt_Putake.Pustatus),SqlSugar.OrderByType.Asc },
- { nameof(Dt_Putake.CreateDate),SqlSugar.OrderByType.Asc }//鎸夌姸鎬佸拰鍒涘缓鏃堕棿鍗囧簭鎺掑簭
+ // { nameof(Dt_Putake.CreateDate),SqlSugar.OrderByType.Asc }//鎸夌姸鎬佸拰鍒涘缓鏃堕棿鍗囧簭鎺掑簭
};
return base.GetPageData(options);
}
@@ -127,7 +127,7 @@
case cond.寰呰川妫�: // 瀹屾垚璐ㄦ鏃堕棿
putake.Pustatus = (int)cond.宸插畬鎴�;
- DateTime latestTime = new DateTime(1900, 1, 1, 0, 0, 0);
+ //DateTime latestTime = new DateTime(1900, 1, 1, 0, 0, 0);
if (gruops == "鏈烘")
{
@@ -146,8 +146,13 @@
}
// 鑾峰彇鏈�鍚庝竴娆″畬鎴愮殑鏃堕棿
- latestTime = new[] { nj.confirmTime_LC, nj.confirmTime_DQ, nj.confirmTime_DG }.Max(); // 鍙栨渶鏂扮殑鏃堕棿
+ // latestTime = (DateTime)new[] { nj.confirmTime_LC, nj.confirmTime_DQ, nj.confirmTime_DG }.Max(); // 鍙栨渶鏂扮殑鏃堕棿
+ DateTime? latestTime = new[] { nj.confirmTime_LC, nj.confirmTime_DQ, nj.confirmTime_DG }
+ .Where(t => t.HasValue) // 杩囨护鎺� null
+ .Select(t => t.Value) // 鍙栧嚭闈炵┖鐨勫��
+ .DefaultIfEmpty(DateTime.Now) // 鑻ユ暟缁勪负绌猴紝浣跨敤褰撳墠鏃堕棿
+ .Max(); // 鍙栨渶澶ф椂闂�
nj.endTime = latestTime; // 璧嬪�兼渶鏂版椂闂�
putake.Finishedtime = DateTime.Now;
break;
--
Gitblit v1.9.3