From 8a6d160963ff362fea468637b1a0873d445d7aea Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 29 四月 2025 16:07:06 +0800
Subject: [PATCH] 大屏修改

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java |    5 +++++
 1 files changed, 5 insertions(+), 0 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 7a72e3f..11c9ded 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
@@ -41,6 +41,7 @@
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -218,6 +219,7 @@
             while (iterator.hasNext()){
                 AnalysisOrderData analysisOrderData = iterator.next();
                 try {
+                    analysisOrderData.setDataType(1);
                     analysisOrderData.setOrderDate(new SimpleDateFormat("yyyy-MM-dd").parse(analysisOrderData.getOrderDateStr()));
                 }catch (Exception e){
                     errors.add("回收订单编号:["+analysisOrderData.getOrderNum()+"],时间格式化错误,忽略导入");
@@ -256,10 +258,13 @@
                 analysisOrderData.setUserPhone(order.getReservationPhone());
                 analysisOrderData.setRecyclePerson(order.getServerName());
                 analysisOrderData.setState(order.getState());
+                analysisOrderData.setImportTime(LocalDateTime.now());
+                analysisOrderData.setDataType(2);
                 analysisOrderDataList.add(analysisOrderData);
             });
             // 删除今日订单
             analysisOrderDataService.remove(new QueryWrapper<AnalysisOrderData>().lambda()
+                            .eq(AnalysisOrderData::getDataType,2)
                     .like(AnalysisOrderData::getOrderDate, new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
             );
             analysisOrderDataService.saveBatch(analysisOrderDataList);

--
Gitblit v1.7.1