个人画像时间处理

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

@@ -25,6 +25,9 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -89,6 +92,9 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
         EmployeePortraitVO vo = new EmployeePortraitVO();
         vo.setPersonName(personName);
 
+        //前提:设置时间开始时间00:00:00 结束时间23:59:59
+        beginTime = normalizeBeginTime(beginTime);
+        endTime = normalizeEndTime(endTime);
         // 1. 用户基本信息
         fillUserInfo(vo, personName);
 
@@ -539,4 +545,36 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
         });
         return result;
     }
+
+    /**
+     * 规范化开始时间: 格式化为 yyyy-MM-dd 00:00:00
+     */
+    private String normalizeBeginTime(String timeStr) {
+        if (timeStr == null || timeStr.isEmpty()) {
+            return timeStr;
+        }
+        try {
+            LocalDateTime dateTime = LocalDateTime.parse(timeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            return dateTime.toLocalDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + " 00:00:00";
+        } catch (Exception e) {
+            LocalDate date = LocalDate.parse(timeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + " 00:00:00";
+        }
+    }
+
+    /**
+     * 规范化结束时间: 格式化为 yyyy-MM-dd 23:59:59
+     */
+    private String normalizeEndTime(String timeStr) {
+        if (timeStr == null || timeStr.isEmpty()) {
+            return timeStr;
+        }
+        try {
+            LocalDateTime dateTime = LocalDateTime.parse(timeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            return dateTime.toLocalDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + " 23:59:59";
+        } catch (Exception e) {
+            LocalDate date = LocalDate.parse(timeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + " 23:59:59";
+        }
+    }
 }