1.修改承运订单/托运订单导出返回为void

2.修改导出格式处理

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

@@ -90,14 +90,13 @@ public class AcceptCarriageOrderController {
      * @return
      */
     @RequestMapping(value = "/acceptCarriageOrderExport", method = RequestMethod.POST)
-    public HttpResult exportAcceptCarriage(@Validated @RequestBody AcceptCarriageOrderQuery query) {
+    public void exportAcceptCarriage(@Validated @RequestBody AcceptCarriageOrderQuery query) {
         HttpServletResponse response = RequestHolder.getResponse();
         List<AcceptCarriageOrderExcelVo> list = acceptCarriageOrderService.exportAcceptCarriage(query, "2");
         if (org.springframework.util.CollectionUtils.isEmpty(list)){
             throw new CustomPromptException(HttpStatus.SUCCESS_CODE,"暂无数据，请确认");
         }
-        ExcelUtil.download(response, AcceptCarriageOrderExcelVo.class, list);
-        return null;
+        ExcelUtil.downData(response, AcceptCarriageOrderExcelVo.class, list);
     }
 
     /**

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

@@ -91,14 +91,13 @@ public class ConsignOrderController {
      * @return
      */
     @RequestMapping(value = "/consignExport", method = RequestMethod.POST)
-    public HttpResult exportConsign(@Validated @RequestBody ConsignOrderQuery query) {
+    public void exportConsign(@Validated @RequestBody ConsignOrderQuery query) {
         HttpServletResponse response = RequestHolder.getResponse();
         List<ConsignOrderExcelVo> list = consignOrderService.exportConsign(query, "1");
         if (CollectionUtils.isEmpty(list)) {
             throw new CustomPromptException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认");
         }
-        ExcelUtil.download(response, ConsignOrderExcelVo.class, list);
-        return null;
+        ExcelUtil.downData(response, ConsignOrderExcelVo.class, list);
     }
 
 

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

@@ -85,7 +85,7 @@ public class ManagementLogisticsOrderController {
      * @return
      */
     @RequestMapping(value = "/export", method = RequestMethod.POST)
-    public HttpResult exportLogisticsOrder(@Validated @RequestBody ManagementLogisticsOrderQuery query) {
+    public void exportLogisticsOrder(@Validated @RequestBody ManagementLogisticsOrderQuery query) {
         log.error("运营管理端-物流订单-导出 query :{}", JSONObject.toJSONString(query));
         HttpServletResponse response = RequestHolder.getResponse();
         List<ManagementLogisticsOrderExcelVo> list = managementLogisticsOrderService.exportLogisticsOrder(query);
@@ -94,7 +94,6 @@ public class ManagementLogisticsOrderController {
         }
 //      Translator.translate(list);
         ExcelUtil.downData(response, ManagementLogisticsOrderExcelVo.class, list);
-        return null;
     }
 
 

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

@@ -77,15 +77,14 @@ public class ManagementWaybillOrderController {
      * @return
      */
     @RequestMapping(value = "/export", method = RequestMethod.POST)
-    public HttpResult exportWaybillOrder(@Validated @RequestBody ManagementWaybillOrderQuery query) {
+    public void exportWaybillOrder(@Validated @RequestBody ManagementWaybillOrderQuery query) {
         log.error("运营管理端-运单-导出 query :{}", JSONObject.toJSONString(query));
         HttpServletResponse response = RequestHolder.getResponse();
         List<ManagementWaybillOrderExcelVO> list = managementWaybillOrderService.exportWaybillOrder(query);
         if (CollectionUtils.isEmpty(list)){
             throw new CustomPromptException(HttpStatus.SUCCESS_CODE,"暂无数据，请确认");
         }
-        ExcelUtil.download(response, ManagementWaybillOrderExcelVO.class, list);
-        return null;
+        ExcelUtil.downData(response, ManagementWaybillOrderExcelVO.class, list);
     }
 
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/execlVo/AcceptCarriageOrderExcelVo.java

@@ -238,15 +238,15 @@ public class AcceptCarriageOrderExcelVo {
     private String unloadAmount;
 
 
-    /**
-     * 订单来源
-     */
-    private String type;
-
-    /**
-     * 订单来源
-     */
-    private String orderSource;
+//    /**
+//     * 订单来源
+//     */
+//    private String type;
+//
+//    /**
+//     * 订单来源
+//     */
+//    private String orderSource;
 
     /**
      * 订单来源翻译

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -1116,7 +1116,7 @@
         a.settlement_cycle AS settlementCycle,
         a.price AS price,
         a.price_type AS priceType,
-        a.type AS type,
+        a.type AS orderSource,
         a.unit AS unit,
         a.subcontract_amount AS subcontractAmount,
         a.entrust_amount AS entrustAmount,