From 495a360c52ed651610472253cce9f0cc2ce31daf Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Sat, 20 Apr 2024 14:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lihongjie/coal/base/dto/CommonQuery.java     | 13 ++++++++++++-
 .../entity/WeightDeviceDataEntity.java              |  7 +++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/lihongjie/coal/base/dto/CommonQuery.java b/src/main/java/cn/lihongjie/coal/base/dto/CommonQuery.java
index 12dd5616..d6862b9f 100644
--- a/src/main/java/cn/lihongjie/coal/base/dto/CommonQuery.java
+++ b/src/main/java/cn/lihongjie/coal/base/dto/CommonQuery.java
@@ -761,7 +761,17 @@ public class CommonQuery {
             return new ArrayList<>();
         }
 
-        return orders.stream().map(x -> new Sort.Order(x.direction, x.property)).toList();
+        return orders.stream()
+                .map(
+                        x ->
+                                new Sort.Order(x.direction, x.property)
+                                        .with(
+                                                Sort.NullHandling.valueOf(
+                                                        StringUtils.defaultIfBlank(
+                                                                x.nullHandling,
+                                                                Sort.NullHandling.NULLS_LAST
+                                                                        .name()))))
+                .toList();
     }
 
     public Specification specification(ConversionService conversionService) {
@@ -1111,6 +1121,7 @@ public class CommonQuery {
 
         private final Sort.Direction direction;
         private final String property;
+        private final String nullHandling;
     }
 
     @Data
diff --git a/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java b/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java
index 249af03e..2bc1b34c 100644
--- a/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java
+++ b/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java
@@ -3,6 +3,7 @@ package cn.lihongjie.coal.weightDeviceData.entity;
 import cn.lihongjie.coal.base.entity.OrgCommonEntity;
 import cn.lihongjie.coal.weightDevice.entity.WeightDeviceEntity;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ManyToOne;
@@ -460,4 +461,10 @@ public class WeightDeviceDataEntity extends OrgCommonEntity {
     private String archiveStatus = "0";
 
 
+    @Comment("最小时间, 用于排序")
+    @Column(insertable = false, updatable = false, columnDefinition = " timestamp(6) generated always as ( least(mz_time, pz_time, ycgbtime, ecgb_time) ) stored ")
+
+    private LocalDateTime minTime;
+
+
 }