From fd345592daef5f203af84eeb4fa33fd989a2ba66 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 30 四月 2025 10:55:45 +0800
Subject: [PATCH] 大屏修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 3 ++-
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java | 7 ++++++-
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java | 1 +
3 files changed, 9 insertions(+), 2 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());
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
index 955bb96..523bb87 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/model/AnalysisOrderData.java
@@ -82,6 +82,7 @@
private Integer state;
@ApiModelProperty(value = "导入时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("import_time")
private LocalDateTime importTime;
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 8990bdc..b3acb0e 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -919,7 +919,8 @@
@GetMapping(value = "/getTodayOrderData")
public R<List<Order>> getTodayOrderData() {
List<Order> orders = orderService.list(Wrappers.lambdaQuery(Order.class)
- .between(Order::getCreateTime, LocalDate.now().atStartOfDay(), LocalDate.now().plusDays(1).atStartOfDay()));
+ .eq(Order::getTime, LocalDate.now())
+ .eq(Order::getIsDelete, 0));
return R.ok(orders);
}
--
Gitblit v1.7.1