预警页面-员工综合评估预警看板排序

airport-common/src/main/java/com/sundot/airport/common/dto/LedgerCommonQueryReqVO.java

@@ -6,6 +6,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * 台账统计查询 Req Entity
@@ -36,15 +37,20 @@ public class LedgerCommonQueryReqVO implements Serializable {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
 
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 
+    /**
+     * 排序
+     */
+    Map<String, String> sorts;
+
 }

airport-common/src/main/java/com/sundot/airport/common/utils/StreamSortUtils.java

@@ -0,0 +1,62 @@
+package com.sundot.airport.common.utils;
+
+import java.lang.reflect.Field;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 排序工具类（支持 Integer /Long / BigDecimal / String / Date）
+ */
+public class StreamSortUtils {
+
+    /**
+     * 根据 Map 动态排序
+     *
+     * @param list   待排序集合
+     * @param sorts  key=字段名, value=asc/desc
+     */
+    public static <T> List<T> sort(List<T> list, Map<String, String> sorts) {
+        if (list == null || list.isEmpty() || sorts == null || sorts.isEmpty()) {
+            return list;
+        }
+
+        Comparator<T> comparator = null;
+
+        for (Map.Entry<String, String> entry : sorts.entrySet()) {
+            String fieldName = entry.getKey();
+            boolean desc = "desc".equalsIgnoreCase(entry.getValue());
+
+            Comparator<T> current = Comparator.comparing(
+                    t -> getFieldValue(t, fieldName),
+                    Comparator.nullsLast(Comparator.naturalOrder())
+            );
+
+            if (desc) {
+                current = current.reversed();
+            }
+
+            comparator = comparator == null ? current : comparator.thenComparing(current);
+        }
+
+        return list.stream()
+                .sorted(comparator)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 反射获取字段值（支持 BigDecimal / String / Date）
+     */
+    @SuppressWarnings("unchecked")
+    private static <T> Comparable<Object> getFieldValue(T obj, String fieldName) {
+        try {
+            Field field = obj.getClass().getDeclaredField(fieldName);
+            field.setAccessible(true);
+            return (Comparable<Object>) field.get(obj);
+        } catch (Exception e) {
+            throw new RuntimeException("排序字段不存在或不可比较: " + fieldName, e);
+        }
+    }
+
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerWarningServiceImpl.java

@@ -13,6 +13,7 @@ import com.sundot.airport.common.enums.LedgerStatusLabelEnum;
 import com.sundot.airport.common.enums.ScoreLevelEnum;
 import com.sundot.airport.common.utils.DeptUtils;
 import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.common.utils.StreamSortUtils;
 import com.sundot.airport.ledger.domain.ScoreEvent;
 import com.sundot.airport.ledger.domain.ScoreIndicator;
 import com.sundot.airport.ledger.domain.vo.LedgerWarningDetailItemVO;
@@ -33,6 +34,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -187,7 +189,14 @@ public class LedgerWarningServiceImpl implements ILedgerWarningService {
         BigDecimal sum = ledgerWarningDetailItemList.stream().map(LedgerWarningDetailItemVO::getOverallScore).reduce(BigDecimal.ZERO, BigDecimal::add);
         BigDecimal averageComprehensiveScore = CollUtil.isEmpty(ledgerWarningDetailItemList) ? BigDecimal.ZERO : sum.divide(BigDecimal.valueOf(ledgerWarningDetailItemList.size()), 2, RoundingMode.HALF_UP);
         result.setAverageComprehensiveScore(averageComprehensiveScore);
-        result.setLedgerWarningDetailItemList(ledgerWarningDetailItemList);
+        // 排序
+        if (ObjUtil.isNull(queryReq.getSorts())) {
+            Map<String, String> sorts = new LinkedHashMap<>();
+            sorts.put("overallScore", "desc");
+            queryReq.setSorts(sorts);
+        }
+        List<LedgerWarningDetailItemVO> ledgerWarningDetailItemListSort = StreamSortUtils.sort(ledgerWarningDetailItemList, queryReq.getSorts());
+        result.setLedgerWarningDetailItemList(ledgerWarningDetailItemListSort);
         return result;
     }