From 67d77fd723d7104b1c52c13eadb4645aaddd7a1f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 29 四月 2025 17:44:28 +0800
Subject: [PATCH] 大屏修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java | 15 +++++++++++++--
1 files changed, 13 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 533fc99..7035d4d 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
@@ -7,6 +7,7 @@
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.hutool.core.io.resource.ClassPathResource;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.MasterWorker;
@@ -20,6 +21,7 @@
import com.ruoyi.admin.vo.SiteLargeeVO;
import com.ruoyi.admin.vo.WorkersLargeeVO;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.entity.Order;
@@ -39,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;
@@ -216,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()+"],时间格式化错误,忽略导入");
@@ -246,16 +250,23 @@
orders.forEach(order -> {
AnalysisOrderData analysisOrderData = new AnalysisOrderData();
analysisOrderData.setOrderNum(order.getOrderNumber());
- analysisOrderData.setOrderDate(analysisOrderData.getOrderDate());
-// analysisOrderData.setOrderChannel(order.getOrderChannel());
+ analysisOrderData.setOrderDate(order.getCreateTime());
+ analysisOrderData.setOrderChannel(order.getSiteName());
analysisOrderData.setCity(order.getCity());
analysisOrderData.setOrderCategory(order.getServeName());
analysisOrderData.setUserName(order.getReservationName());
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);
}
return R.ok();
--
Gitblit v1.7.1