Преглед изворни кода

[26110501] 光伏上传率统计导出文件名时间戳改为起始_截止(如光伏上传率统计_20261101_20261104.xlsx, 起始=截止时只保留一个), 前端saveAs与后端Content-Disposition同步

taosj пре 20 часа
родитељ
комит
763c9594f3

+ 4 - 1
forecast-backend-server/src/main/java/com/ufo/project/forecast/fileupload/controller/DataReportLogController.java

@@ -113,7 +113,10 @@ public class DataReportLogController extends BaseController
         List<UploadRateStatVO> data = dataReportLogService.uploadRateExportList(query);
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("光伏上传率统计_" + query.getEndTime().replace("-", "") + ".xlsx",
+        String dateRange = StringUtils.equals(query.getStartTime(), query.getEndTime())
+                ? query.getStartTime()
+                : query.getStartTime() + "_" + query.getEndTime();
+        String fileName = URLEncoder.encode("光伏上传率统计_" + dateRange.replace("-", "") + ".xlsx",
                 "UTF-8").replaceAll("\\+", "%20");
         response.setHeader("Content-Disposition", "attachment;filename*=utf-8''" + fileName);
         EasyExcel.write(response.getOutputStream(), UploadRateStatVO.class)

+ 2 - 1
forecast-backend-vue/src/views/ufo/electricity/statanalysis/uploadRateStat.vue

@@ -156,7 +156,8 @@ const handleExport = async () => {
     });
     const isFile = await blobValidate(res);
     if (isFile) {
-      saveAs(new Blob([res]), `光伏上传率统计_${query.endTime.replaceAll('-', '')}.xlsx`);
+      const dateRange = query.startTime === query.endTime ? query.startTime : `${query.startTime}_${query.endTime}`;
+      saveAs(new Blob([res]), `光伏上传率统计_${dateRange.replaceAll('-', '')}.xlsx`);
       message.success('导出成功');
     } else {
       const text = await res.text();