问题更改
This commit is contained in:
@ -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<XyDataCheck> yxs = xyCheckMapper.selectYxCount(checkStatus.getBeginDate(), checkStatus.getEndDate());
|
||||
List<XyCheckExport> 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<XyCheckExport> 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
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
update data_check_status set check_status = 2,end_date = #{checkDate}
|
||||
</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>
|
||||
|
||||
|
Reference in New Issue
Block a user