From d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 06 十一月 2024 18:02:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index b94b768..f468f8b 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -47,11 +47,9 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
import java.math.BigDecimal;
+import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.time.LocalDateTime;
@@ -470,6 +468,9 @@
// changeDispatch.setUserName(item.getReservationName());
// changeDispatch.setIsDelete(Constants.ZERO);
// result = dispatchClient.saveRecord(changeDispatch).getData();
+ }else {
+ orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());
+
}
ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(orderReasinDto.getWorkerId()));
if (null != context) {
@@ -763,6 +764,23 @@
// return R.ok(list);
// }
+ @ApiOperation(value = "导入模板下载", tags = {"管理后台"})
+ @PostMapping(value = "/importTemplate")
+ public R<String> importTemplate(HttpServletResponse response) throws Exception {
+ List<FrozenBuckleImportDTO> list = new ArrayList<>();
+ FrozenBuckleImportDTO bean = new FrozenBuckleImportDTO();
+
+ list.add(bean);
+
+ // 这里URLEncoder.encode可以防止中文乱码
+ String fileName = URLEncoder.encode("订单导入模板", "UTF-8");
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), FrozenBuckleImportDTO.class).sheet("订单导入模板").doWrite(list);
+ return R.ok("下载成功!");
+ }
+
/**
* 管理后台-订单导入
*/
@@ -807,7 +825,7 @@
// 设置sheet,默认读取第一个
.sheet()
// 设置标题(字段列表)所在行数
- .headRowNumber(2)
+ .headRowNumber(1)
.doRead();
System.err.println(successArrayList);
@@ -838,6 +856,8 @@
Site site = sites.stream().filter(e -> e.getSiteName().equals(frozenBuckleImportDTO.getSiteName())).findFirst().orElse(null);
if(Objects.nonNull(site)){
order.setSiteId(site.getId());
+ }else {
+ return R.fail("站点信息不存在");
}
// 师傅信息
if (StringUtils.hasLength(order.getServerName())) {
@@ -845,6 +865,8 @@
if(Objects.nonNull(masterWorker)){
order.setServerId(masterWorker.getId());
order.setServerPhone(masterWorker.getPhone());
+ }else {
+ return R.fail("师傅信息不存在");
}
order.setAcceptTime(new Date());
// 待上门
@@ -862,6 +884,8 @@
if(Objects.nonNull(recoveryServe)){
order.setServeId(recoveryServe.getId());
order.setServePrice(recoveryServe.getDefaultPrice());
+ }else {
+ return R.fail("回收服务不存在");
}
RecoveryServePrice one = recoveryServePriceService.lambdaQuery().eq(RecoveryServePrice::getCity, order.getCityCode()).eq(RecoveryServePrice::getRecoveryServeId, order.getServeId()).eq(BaseEntity::getIsDelete, 0).one();
if (one==null) {
--
Gitblit v1.7.1