Przeglądaj źródła

1、运力导出接口调整;

zk 2 lat temu
rodzic
commit
15886577c3

+ 3 - 3
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfDriverController.java

@@ -125,15 +125,15 @@ public class KwfDriverController {
      * @date 2023/07/11
      * @date 2023/07/11
      **/
      **/
     @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
     @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
-    public void export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
+    public HttpResult export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         /**分页数据**/
         /**分页数据**/
         List<KwfDriverVo> drivers = driverService.findPage(params);
         List<KwfDriverVo> drivers = driverService.findPage(params);
 
 
         if (!CollectionUtils.isEmpty(drivers)) {
         if (!CollectionUtils.isEmpty(drivers)) {
             ExcelUtil.downData(response, KwfDriverVo.class, drivers);
             ExcelUtil.downData(response, KwfDriverVo.class, drivers);
-            //return null;
+            return HttpResult.ok();
         }
         }
-        //return HttpResult.error("无数据!");
+        return HttpResult.error("无数据!");
     }
     }
 
 
     /**
     /**

+ 1 - 1
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfFleetController.java

@@ -87,7 +87,7 @@ public class KwfFleetController {
 
 
         if (!CollectionUtils.isEmpty(fleets)) {
         if (!CollectionUtils.isEmpty(fleets)) {
             ExcelUtil.downData(response, KwfFleetVo.class, fleets);
             ExcelUtil.downData(response, KwfFleetVo.class, fleets);
-            return null;
+            return HttpResult.ok();
         }
         }
         return HttpResult.error("无数据!");
         return HttpResult.error("无数据!");
     }
     }

+ 1 - 1
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -144,7 +144,7 @@ public class KwfTruckController {
 
 
         if (!CollectionUtils.isEmpty(trucks)) {
         if (!CollectionUtils.isEmpty(trucks)) {
             ExcelUtil.downData(response, KwfTruckVo.class, trucks);
             ExcelUtil.downData(response, KwfTruckVo.class, trucks);
-            return null;
+            return HttpResult.ok();
         }
         }
         return HttpResult.error("无数据!");
         return HttpResult.error("无数据!");
     }
     }

+ 1 - 1
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckReportController.java

@@ -80,7 +80,7 @@ public class KwfTruckReportController {
 
 
         if (!CollectionUtils.isEmpty(trucks)) {
         if (!CollectionUtils.isEmpty(trucks)) {
             ExcelUtil.downData(response, KwfTruckReportVo.class, trucks);
             ExcelUtil.downData(response, KwfTruckReportVo.class, trucks);
-            return null;
+            return HttpResult.ok();
         }
         }
         return HttpResult.error("无数据!");
         return HttpResult.error("无数据!");
     }
     }