Merge remote-tracking branch 'origin/dev' into dev

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

@@ -2,6 +2,7 @@ package com.sckw.fleet.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.page.PageHelperUtil;
@@ -128,14 +129,15 @@ public class KwfDriverController {
      * @date 2023/07/11
      **/
     @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
-    public void export(@RequestBody Map<String, Object> params, HttpServletResponse response) throws IOException {
+    public void export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         /**分页数据**/
         List<KwfDriverVo> drivers = driverService.findPage(params);
 
-        if (!CollectionUtils.isEmpty(drivers)) {
-            ExcelUtil.downData(response, KwfDriverVo.class, drivers);
+        if (CollectionUtils.isEmpty(drivers)) {
+            throw new BusinessException("没有您想导出的数据！");
         }
-        ResponseUtil.writer(response, HttpResult.error("没有您想导出的数据！"));
+        ExcelUtil.downData(response, KwfDriverVo.class, drivers);
+        //ResponseUtil.writer(response, HttpResult.error("没有您想导出的数据！"));
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.sckw.fleet.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
@@ -83,15 +84,15 @@ public class KwfFleetController {
      * @date 2023/07/11
      **/
     @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
-    public void export(@RequestBody Map<String, Object> params, HttpServletResponse response) throws IOException {
+    public void export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         params.put("entId", LoginUserHolder.getEntId());
         /**查询分页数据**/
         List<KwfFleetVo> fleets = fleetService.findPage(params);
 
-        if (!CollectionUtils.isEmpty(fleets)) {
-            ExcelUtil.downData(response, KwfFleetVo.class, fleets);
+        if (CollectionUtils.isEmpty(fleets)) {
+            throw new BusinessException("没有您想导出的数据！");
         }
-        ResponseUtil.writer(response, HttpResult.error("没有您想导出的数据！"));
+        ExcelUtil.downData(response, KwfFleetVo.class, fleets);
     }
 
     /**

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.SystemTypeEnum;
@@ -139,14 +140,14 @@ public class KwfTruckController {
      * @date 2023/07/11
      **/
     @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
-    public void export(@RequestBody Map<String, Object> params, HttpServletResponse response) throws IOException {
+    public void export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         /**查询数据**/
         List<KwfTruckVo> trucks = truckService.findPage(params);
 
-        if (!CollectionUtils.isEmpty(trucks)) {
-            ExcelUtil.downData(response, KwfTruckVo.class, trucks);
+        if (CollectionUtils.isEmpty(trucks)) {
+            throw new BusinessException("没有您想导出的数据！");
         }
-        ResponseUtil.writer(response, HttpResult.error("没有您想导出的数据！"));
+        ExcelUtil.downData(response, KwfTruckVo.class, trucks);
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.sckw.fleet.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
@@ -77,15 +78,15 @@ public class KwfTruckReportController {
      * @date 2023/07/18
      **/
     @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
-    public void export(@RequestBody Map<String, Object> params, HttpServletResponse response) throws IOException {
+    public void export(@RequestBody Map<String, Object> params, HttpServletResponse response) {
         params.put("entId", LoginUserHolder.getEntId());
         /**查询数据**/
         List<KwfTruckReportVo> trucks = reportService.findPage(params);
 
-        if (!CollectionUtils.isEmpty(trucks)) {
-            ExcelUtil.downData(response, KwfTruckReportVo.class, trucks);
+        if (CollectionUtils.isEmpty(trucks)) {
+            throw new BusinessException("没有您想导出的数据！");
         }
-        ResponseUtil.writer(response, HttpResult.error("没有您想导出的数据！"));
+        ExcelUtil.downData(response, KwfTruckReportVo.class, trucks);
     }
 
     /**