修改承运订单-托运订单导出空数据提示

修改运营端-物流订单导出空数据展示

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageOrderController.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.sckw.core.exception.CustomPromptException;
 import com.sckw.core.model.enums.OrderRuleEnum;
 import com.sckw.core.model.enums.RedisOrderGenerateEnum;
 import com.sckw.core.model.page.PageRes;
@@ -92,11 +93,11 @@ public class AcceptCarriageOrderController {
     public HttpResult exportAcceptCarriage(@Validated @RequestBody AcceptCarriageOrderQuery query) {
         HttpServletResponse response = RequestHolder.getResponse();
         List<AcceptCarriageOrderExcelVo> list = acceptCarriageOrderService.exportAcceptCarriage(query, "2");
-        if (!org.springframework.util.CollectionUtils.isEmpty(list)) {
-            ExcelUtil.download(response, AcceptCarriageOrderExcelVo.class, list);
-            return null;
+        if (org.springframework.util.CollectionUtils.isEmpty(list)){
+            throw new CustomPromptException(HttpStatus.SUCCESS_CODE,"暂无数据，请确认");
         }
-        return HttpResult.ok("没有可导出的数据");
+        ExcelUtil.download(response, AcceptCarriageOrderExcelVo.class, list);
+        return null;
     }
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/ConsignOrderController.java

@@ -1,10 +1,12 @@
 package com.sckw.transport.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.sckw.core.exception.CustomPromptException;
 import com.sckw.core.model.enums.OrderRuleEnum;
 import com.sckw.core.model.enums.RedisOrderGenerateEnum;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.model.vo.BaseList;
+import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.OrderGenerateSeqNoUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
@@ -91,12 +93,12 @@ public class ConsignOrderController {
     @RequestMapping(value = "/consignExport", method = RequestMethod.POST)
     public HttpResult exportConsign(@Validated @RequestBody ConsignOrderQuery query) {
         HttpServletResponse response = RequestHolder.getResponse();
-        List<ConsignOrderExcelVo> list = consignOrderService.exportConsign(query,"1");
-        if (!org.springframework.util.CollectionUtils.isEmpty(list)) {
-            ExcelUtil.download(response, ConsignOrderExcelVo.class, list);
-            return null;
+        List<ConsignOrderExcelVo> list = consignOrderService.exportConsign(query, "1");
+        if (CollectionUtils.isEmpty(list)) {
+            throw new CustomPromptException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认");
         }
-        return HttpResult.ok("没有可导出的数据");
+        ExcelUtil.download(response, ConsignOrderExcelVo.class, list);
+        return null;
     }
 
 
@@ -156,7 +158,7 @@ public class ConsignOrderController {
     /**
      * 托运订单-设置停止接单-提交-针对循环单
      *
-     * @param stopOrderTakingDTO    请求参数
+     * @param stopOrderTakingDTO 请求参数
      * @return
      */
     @RequestMapping(value = "/consignStopDocumentCommit", method = RequestMethod.POST)
@@ -230,9 +232,9 @@ public class ConsignOrderController {
      * @return
      */
     @RequestMapping(value = "/getRejectReason", method = RequestMethod.GET)
-    public HttpResult getRejectReasonById( @NotBlank @RequestParam("id") String id,
-                                           @NotNull @RequestParam("status") Integer status) {
-        return consignOrderService.getRejectReasonById(id,status);
+    public HttpResult getRejectReasonById(@NotBlank @RequestParam("id") String id,
+                                          @NotNull @RequestParam("status") Integer status) {
+        return consignOrderService.getRejectReasonById(id, status);
     }
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/operationManagement/ManagementLogisticsOrderController.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.controller.operationManagement;
 
 import com.alibaba.fastjson.JSONObject;
+import com.sckw.core.exception.CustomPromptException;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
@@ -18,6 +19,7 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -87,12 +89,12 @@ public class ManagementLogisticsOrderController {
         log.error("运营管理端-物流订单-导出 query :{}", JSONObject.toJSONString(query));
         HttpServletResponse response = RequestHolder.getResponse();
         List<ManagementLogisticsOrderExcelVo> list = managementLogisticsOrderService.exportLogisticsOrder(query);
-        if (!org.springframework.util.CollectionUtils.isEmpty(list)) {
-//            Translator.translate(list);
-            ExcelUtil.downData(response, ManagementLogisticsOrderExcelVo.class, list);
-            return null;
+        if (CollectionUtils.isEmpty(list)) {
+            throw new CustomPromptException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认");
         }
-        return HttpResult.ok("没有可导出的数据");
+//      Translator.translate(list);
+        ExcelUtil.downData(response, ManagementLogisticsOrderExcelVo.class, list);
+        return null;
     }
 
 
@@ -140,7 +142,7 @@ public class ManagementLogisticsOrderController {
      */
     @RequestMapping(value = "/getLogisticsContract", method = RequestMethod.POST)
     public HttpResult getLogisticsContract(@Valid @RequestBody ManagementContractParam contractParam) {
-        log.info("基础档案-物流合同档案-根据合同id获取托运订单列表 query:{}",JSONObject.toJSONString(contractParam));
+        log.info("基础档案-物流合同档案-根据合同id获取托运订单列表 query:{}", JSONObject.toJSONString(contractParam));
         try {
             return managementLogisticsOrderService.getLogisticsContract(contractParam);
         } catch (Exception e) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/operationManagement/ManagementWaybillOrderController.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.controller.operationManagement;
 
 import com.alibaba.fastjson.JSONObject;
+import com.sckw.core.exception.CustomPromptException;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.config.easyexcel.RequestHolder;
@@ -13,6 +14,7 @@ import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -79,11 +81,11 @@ public class ManagementWaybillOrderController {
         log.error("运营管理端-运单-导出 query :{}", JSONObject.toJSONString(query));
         HttpServletResponse response = RequestHolder.getResponse();
         List<ManagementWaybillOrderExcelVO> list = managementWaybillOrderService.exportWaybillOrder(query);
-        if (!org.springframework.util.CollectionUtils.isEmpty(list)) {
-            ExcelUtil.download(response, ManagementWaybillOrderExcelVO.class, list);
-            return null;
+        if (CollectionUtils.isEmpty(list)){
+            throw new CustomPromptException(HttpStatus.SUCCESS_CODE,"暂无数据，请确认");
         }
-        return HttpResult.ok("没有可导出的数据");
+        ExcelUtil.download(response, ManagementWaybillOrderExcelVO.class, list);
+        return null;
     }