sun15684712291/sdwu_dw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

问题更改

Browse Source
This commit is contained in:
sunyg
2025-08-08 16:33:13 +08:00
parent 6ebf0e4429
commit d8b3d067a9
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java
View File

@ -3,7 +3,6 @@ package com.ruoyi.dw.controller;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; 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.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
@ -26,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
@ -150,9 +150,9 @@ public class XyCheckController extends BaseController {
List<XyDataCheck> yxs = xyCheckMapper.selectYxCount(checkStatus.getBeginDate(), checkStatus.getEndDate()); List<XyDataCheck> yxs = xyCheckMapper.selectYxCount(checkStatus.getBeginDate(), checkStatus.getEndDate());
List<XyCheckExport> checks = getChecksExport(alls,gxs,yxs,mondayAndSundays); List<XyCheckExport> checks = getChecksExport(alls,gxs,yxs,mondayAndSundays);
String zipFileName = "进度统计-信息采集-" + DateUtils.dateTimeNow() + ".xlsx"; 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("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<XyCheckExport> excelUtil = new ExcelUtil<>(XyCheckExport.class); ExcelUtil<XyCheckExport> excelUtil = new ExcelUtil<>(XyCheckExport.class);
excelUtil.init(checks, "数据", StringUtils.EMPTY, Excel.Type.EXPORT); excelUtil.init(checks, "数据", StringUtils.EMPTY, Excel.Type.EXPORT);
excelUtil.writeSheet(); excelUtil.writeSheet();
@ -160,8 +160,6 @@ public class XyCheckController extends BaseController {
workbook.write(response.getOutputStream()); workbook.write(response.getOutputStream());
} }
/** /**
* 获取采集数据更新 * 获取采集数据更新
* @param checkQuery * @param checkQuery

2
ruoyi-dw/src/main/java/com/ruoyi/dw/mapper/DataCheckMapper.java
View File

@ -15,6 +15,6 @@ public interface DataCheckMapper {
public int updateCheck(@Param("startCheckDate") Date startCheckDate, public int updateCheck(@Param("startCheckDate") Date startCheckDate,
@Param("endCheckDate") Date endCheckDate, @Param("endCheckDate") Date endCheckDate,
@Param("weekCheck") Integer weekCheck, @Param("weekCheck") int weekCheck,
@Param("weekTimeCheck") String weekTimeCheck); @Param("weekTimeCheck") String weekTimeCheck);
} }

2
ruoyi-dw/src/main/resources/mapper/dw/DataCheckMapper.xml
View File

@ -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 check_status = 2,end_date = #{checkDate}
</update> </update>
<update id="updateCheck" parameterType="date"> <update id="updateCheck">
update data_check_status set begin_date = #{startCheckDate},end_date = #{endCheckDate},week_check = #{weekCheck},week_time_check = #{weekTimeCheck} update data_check_status set begin_date = #{startCheckDate},end_date = #{endCheckDate},week_check = #{weekCheck},week_time_check = #{weekTimeCheck}
</update> </update>