From f39e7de8be43eda95560f49982b6cd0345e24404 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 六月 2025 10:28:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
index 7035d4d..4ea2008 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java
@@ -40,6 +40,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
@@ -250,7 +251,11 @@
orders.forEach(order -> {
AnalysisOrderData analysisOrderData = new AnalysisOrderData();
analysisOrderData.setOrderNum(order.getOrderNumber());
- analysisOrderData.setOrderDate(order.getCreateTime());
+ try {
+ analysisOrderData.setOrderDate(new SimpleDateFormat("yyyy-MM-dd").parse(order.getTime()));
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
analysisOrderData.setOrderChannel(order.getSiteName());
analysisOrderData.setCity(order.getCity());
analysisOrderData.setOrderCategory(order.getServeName());
--
Gitblit v1.7.1