修改出现的问题

ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java

@@ -75,7 +75,9 @@ public class XyCheckController extends BaseController {
         endTime.set(Calendar.SECOND, 59);
         endTime.set(Calendar.MILLISECOND, 0);
         Date endDate = endTime.getTime();
-        dataCheckMapper.updateCheck(startDate, endDate,checkStatus.getWeekCheck(),checkStatus.getWeekTimeCheck(),"dw");
+        dataCheckMapper.updateCheck(startDate, endDate,
+                checkStatus.getWeekCheck(),checkStatus.getWeekTimeCheck(),
+                "dw");
         return AjaxResult.success("设置成功");
     }
 
@@ -99,7 +101,9 @@ public class XyCheckController extends BaseController {
         endTime.set(Calendar.SECOND, 59);
         endTime.set(Calendar.MILLISECOND, 0);
         Date endDate = endTime.getTime();
-        dataCheckMapper.updateCheck(startDate, endDate,checkStatus.getWeekCheck(),checkStatus.getWeekTimeCheck(),"cj");
+        dataCheckMapper.updateCheck(startDate, endDate,
+                checkStatus.getWeekCheck(),checkStatus.getWeekTimeCheck(),
+                "cj");
         return AjaxResult.success("设置成功");
     }
 
@@ -155,7 +159,7 @@ public class XyCheckController extends BaseController {
      */
     @GetMapping("/zzt")
     public AjaxResult studentCount(CheckQuery checkQuery) {
-        DataCheckStatus checkStatus = dataCheckMapper.getStatus("dw");
+        DataCheckStatus checkStatus = dataCheckMapper.getStatus("cj");
         String[] dates = getWeekRange(checkStatus.getWeekCheck(), checkStatus.getWeekTimeCheck());
         Date date1 = DateUtils.parseDate(dates[0]);
         Date date2 = DateUtils.parseDate(dates[1]);
@@ -216,7 +220,7 @@ public class XyCheckController extends BaseController {
      */
     @PostMapping("/export/cj")
     public void exportCj(HttpServletResponse response) throws IOException {
-        DataCheckStatus checkStatus = dataCheckMapper.getStatus("dw");
+        DataCheckStatus checkStatus = dataCheckMapper.getStatus("cj");
         String[] dates = getWeekRange(checkStatus.getWeekCheck(), checkStatus.getWeekTimeCheck());
         Date date1 = DateUtils.parseDate(dates[0]);
         Date date2 = DateUtils.parseDate(dates[1]);
@@ -237,6 +241,32 @@ public class XyCheckController extends BaseController {
         workbook.write(response.getOutputStream());
     }
 
+    /**
+     * 导出采集数量考核接口
+     * @param response
+     */
+    @PostMapping("/export/dw")
+    public void exportDw(HttpServletResponse response) throws IOException {
+        DataCheckStatus checkStatus = dataCheckMapper.getStatus("dw");
+        String[] dates = getWeekRange(checkStatus.getWeekCheck(), checkStatus.getWeekTimeCheck());
+        Date date1 = DateUtils.parseDate(dates[0]);
+        Date date2 = DateUtils.parseDate(dates[1]);
+        List<XyCheckDw> zj = xyCheckMapper.selectXyCheckDw(checkStatus.getBeginDate(), checkStatus.getEndDate());
+        List<XyCheckDwOut> zjCount = XyCheckDwConverter.convertPreserveOrder(zj);
+        List<XyCheckDw> bz = xyCheckMapper.selectXyCheckDw(date1, date2);
+        List<XyCheckDwOut> bzCount = XyCheckDwConverter.convertPreserveOrder(bz);
+        List<XyCheckDwExport> checks = getCheckDwExport(zjCount,bzCount);
+        String zipFileName = "进度统计-调查问卷-" + DateUtils.dateTimeNow() + ".xlsx";
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+        response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + URLEncoder.encode(zipFileName,"utf-8"));
+        ExcelUtil<XyCheckDwExport> excelUtil = new ExcelUtil<>(XyCheckDwExport.class);
+        excelUtil.init(checks, "数据", StringUtils.EMPTY, Excel.Type.EXPORT);
+        excelUtil.writeSheet();
+        Workbook workbook = excelUtil.getWb();
+        workbook.write(response.getOutputStream());
+    }
+
     /**
      * 获取采集数据更新
      * @param checkQuery
@@ -244,7 +274,7 @@ public class XyCheckController extends BaseController {
      */
     @GetMapping("/zxt")
     public AjaxResult studentCount2(CheckQuery checkQuery) {
-        DataCheckStatus checkStatus = dataCheckMapper.getStatus("dw");
+        DataCheckStatus checkStatus = dataCheckMapper.getStatus("cj");
         Date beginDate = null;
         Date endDate = null;
         if (StringUtils.isNotEmpty(checkQuery.getBeginDate())) {
@@ -342,6 +372,51 @@ public class XyCheckController extends BaseController {
         return checks;
     }
 
+    private List<XyCheckDwExport> getCheckDwExport(List<XyCheckDwOut> zj,List<XyCheckDwOut> bz){
+        List<XyCheckDwExport> checks = new ArrayList<>();
+        int sumBy5nynCount = 0;
+        int sumBy5nysCount = 0;
+        int sumLtxCount = 0;
+        int sumYrdwCount = 0;
+        int sumBy5nynBzCount = 0;
+        int sumBy5nysBzCount = 0;
+        int sumLtxBzCount = 0;
+        int sumYrdwBzCount = 0;
+        for(int i=0;i<zj.size();i++){
+            XyCheckDwExport export = new XyCheckDwExport();
+            export.setXy(zj.get(i).getXy());
+            export.setBy5ynCount(zj.get(i).getBy5ynCount());
+            export.setBy5ysCount(zj.get(i).getBy5ysCount());
+            export.setLtxCount(zj.get(i).getLtxCount());
+            export.setYrdwCount(zj.get(i).getYrdwCount());
+            export.setBy5ynBzCount(bz.get(i).getBy5ynCount());
+            export.setBy5ysBzCount(bz.get(i).getBy5ysCount());
+            export.setLtxBzCount(bz.get(i).getLtxCount());
+            export.setYrdwBzCount(bz.get(i).getYrdwCount());
+            sumBy5nynCount += export.getBy5ynCount();
+            sumBy5nysCount += export.getBy5ysCount();
+            sumLtxCount += export.getLtxCount();
+            sumYrdwCount += export.getYrdwCount();
+            sumBy5nynBzCount += export.getBy5ynBzCount();
+            sumBy5nysBzCount += export.getBy5ysBzCount();
+            sumLtxBzCount += export.getLtxBzCount();
+            sumYrdwBzCount += export.getYrdwBzCount();
+            checks.add(export);
+        }
+        XyCheckDwExport sumCheck = new XyCheckDwExport();
+        sumCheck.setXy("合计");
+        sumCheck.setBy5ynBzCount(sumBy5nynBzCount);
+        sumCheck.setBy5ysBzCount(sumBy5nysBzCount);
+        sumCheck.setLtxBzCount(sumLtxBzCount);
+        sumCheck.setYrdwBzCount(sumYrdwBzCount);
+        sumCheck.setBy5ynCount(sumBy5nynCount);
+        sumCheck.setBy5ysCount(sumBy5nysCount);
+        sumCheck.setLtxCount(sumLtxCount);
+        sumCheck.setYrdwCount(sumYrdwCount);
+        checks.add(sumCheck);
+        return checks;
+    }
+
     /**
      * 拼装数据
      * @param alls

ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDwExport.java

@@ -0,0 +1,105 @@
+package com.ruoyi.dw.domain.vo;
+
+import com.ruoyi.common.annotation.Excel;
+
+public class XyCheckDwExport {
+
+    @Excel(name = "学院名称")
+    private String xy;
+
+    @Excel(name = "毕业五年以内-总计数量")
+    private Integer by5ynCount;
+
+    @Excel(name = "毕业五年以上-总计数量")
+    private Integer by5ysCount;
+
+    @Excel(name = "离退休-总计数量")
+    private Integer ltxCount;
+
+    @Excel(name = "用人单位-总计数量")
+    private Integer yrdwCount;
+
+    @Excel(name = "毕业五年以内-本周数量")
+    private Integer by5ynBzCount;
+
+    @Excel(name = "毕业五年以上-本周数量")
+    private Integer by5ysBzCount;
+
+    @Excel(name = "离退休-本周数量")
+    private Integer ltxBzCount;
+
+    @Excel(name = "用人单位-本周数量")
+    private Integer yrdwBzCount;
+
+    public String getXy() {
+        return xy;
+    }
+
+    public void setXy(String xy) {
+        this.xy = xy;
+    }
+
+    public Integer getBy5ynCount() {
+        return by5ynCount;
+    }
+
+    public void setBy5ynCount(Integer by5ynCount) {
+        this.by5ynCount = by5ynCount;
+    }
+
+    public Integer getBy5ysCount() {
+        return by5ysCount;
+    }
+
+    public void setBy5ysCount(Integer by5ysCount) {
+        this.by5ysCount = by5ysCount;
+    }
+
+    public Integer getLtxCount() {
+        return ltxCount;
+    }
+
+    public void setLtxCount(Integer ltxCount) {
+        this.ltxCount = ltxCount;
+    }
+
+    public Integer getYrdwCount() {
+        return yrdwCount;
+    }
+
+    public void setYrdwCount(Integer yrdwCount) {
+        this.yrdwCount = yrdwCount;
+    }
+
+    public Integer getBy5ynBzCount() {
+        return by5ynBzCount;
+    }
+
+    public void setBy5ynBzCount(Integer by5ynBzCount) {
+        this.by5ynBzCount = by5ynBzCount;
+    }
+
+    public Integer getBy5ysBzCount() {
+        return by5ysBzCount;
+    }
+
+    public void setBy5ysBzCount(Integer by5ysBzCount) {
+        this.by5ysBzCount = by5ysBzCount;
+    }
+
+    public Integer getLtxBzCount() {
+        return ltxBzCount;
+    }
+
+    public void setLtxBzCount(Integer ltxBzCount) {
+        this.ltxBzCount = ltxBzCount;
+    }
+
+    public Integer getYrdwBzCount() {
+        return yrdwBzCount;
+    }
+
+    public void setYrdwBzCount(Integer yrdwBzCount) {
+        this.yrdwBzCount = yrdwBzCount;
+    }
+}