From d8b3d067a9a0b09a3cac757aed4b99286e8107d6 Mon Sep 17 00:00:00 2001 From: sunyugang Date: Fri, 8 Aug 2025 16:33:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/dw/controller/XyCheckController.java | 8 +++----- .../main/java/com/ruoyi/dw/mapper/DataCheckMapper.java | 2 +- ruoyi-dw/src/main/resources/mapper/dw/DataCheckMapper.xml | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java index cb163c8..95fce2d 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java @@ -3,7 +3,6 @@ package com.ruoyi.dw.controller; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -26,6 +25,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.net.URLEncoder; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -150,9 +150,9 @@ public class XyCheckController extends BaseController { List yxs = xyCheckMapper.selectYxCount(checkStatus.getBeginDate(), checkStatus.getEndDate()); List checks = getChecksExport(alls,gxs,yxs,mondayAndSundays); String zipFileName = "进度统计-信息采集-" + DateUtils.dateTimeNow() + ".xlsx"; - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheetzip"); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + zipFileName); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + URLEncoder.encode(zipFileName)); ExcelUtil excelUtil = new ExcelUtil<>(XyCheckExport.class); excelUtil.init(checks, "数据", StringUtils.EMPTY, Excel.Type.EXPORT); excelUtil.writeSheet(); @@ -160,8 +160,6 @@ public class XyCheckController extends BaseController { workbook.write(response.getOutputStream()); } - - /** * 获取采集数据更新 * @param checkQuery diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DataCheckMapper.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DataCheckMapper.java index eb32e28..caecfd5 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DataCheckMapper.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DataCheckMapper.java @@ -15,6 +15,6 @@ public interface DataCheckMapper { public int updateCheck(@Param("startCheckDate") Date startCheckDate, @Param("endCheckDate") Date endCheckDate, - @Param("weekCheck") Integer weekCheck, + @Param("weekCheck") int weekCheck, @Param("weekTimeCheck") String weekTimeCheck); } diff --git a/ruoyi-dw/src/main/resources/mapper/dw/DataCheckMapper.xml b/ruoyi-dw/src/main/resources/mapper/dw/DataCheckMapper.xml index 4d98eca..7eb9143 100644 --- a/ruoyi-dw/src/main/resources/mapper/dw/DataCheckMapper.xml +++ b/ruoyi-dw/src/main/resources/mapper/dw/DataCheckMapper.xml @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update data_check_status set check_status = 2,end_date = #{checkDate} - + update data_check_status set begin_date = #{startCheckDate},end_date = #{endCheckDate},week_check = #{weekCheck},week_time_check = #{weekTimeCheck}