计划停电导出3

fiveep-controller/src/main/java/com/bizmatics/controller/web/WcBlackoutPlanController.java

@@ -78,16 +78,15 @@ public class WcBlackoutPlanController {
      * 停电计划-导出
      *
      * @param startTime 开始时间
-     * @param endTime 结束时间
-     * @param type 状态 1 未执行 2执行中 3 已执行
+     * @param endTime   结束时间
+     * @param type      状态 1 未执行 2执行中 3 已执行
      * @return
      */
     @GetMapping("outagePlanListExport")
-    public ApiResult<Void> outagePlanListExport(@RequestParam(value = "startTime", required = false) String startTime,
-                                                @RequestParam(value = "endTime", required = false) String endTime,
-                                                @RequestParam(value = "type", required = false, defaultValue = "0") Integer type) {
-        wcBlackoutPlanService.outagePlanListExport(startTime, endTime, type);
-        return ApiResult.success();
+    public ApiResult<String> outagePlanListExport(@RequestParam(value = "startTime", required = false) String startTime,
+                                                  @RequestParam(value = "endTime", required = false) String endTime,
+                                                  @RequestParam(value = "type", required = false, defaultValue = "0") Integer type) {
+        return ApiResult.success(wcBlackoutPlanService.outagePlanListExport(startTime, endTime, type));
     }
 
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/WcBlackoutPlanServiceImpl.java

@@ -101,7 +101,6 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
         Workbook workbook = null;
         File file = null;
         try {
-            List<WcBlackoutPlanOneVo> plannedOutageListOne = new ArrayList<>();
             ExportParams params = new ExportParams(null, "停电计划列表");
             workbook = ExcelExportUtil.exportBigExcel(params, WcBlackoutPlanOneExportVo.class,
                     (o, i) -> {