From 8d9fa996199b8681125c493b19ada9c09904466d Mon Sep 17 00:00:00 2001 From: sunyugang Date: Tue, 16 Sep 2025 14:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E7=8E=B0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dw/controller/XyCheckController.java | 85 +++++++++++++- .../ruoyi/dw/domain/vo/XyCheckDwExport.java | 105 ++++++++++++++++++ 2 files changed, 185 insertions(+), 5 deletions(-) create mode 100644 ruoyi-dw/src/main/java/com/ruoyi/dw/domain/vo/XyCheckDwExport.java 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 62b9ada..512db6d 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 @@ -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 zj = xyCheckMapper.selectXyCheckDw(checkStatus.getBeginDate(), checkStatus.getEndDate()); + List zjCount = XyCheckDwConverter.convertPreserveOrder(zj); + List bz = xyCheckMapper.selectXyCheckDw(date1, date2); + List bzCount = XyCheckDwConverter.convertPreserveOrder(bz); + List 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 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 getCheckDwExport(List zj,List bz){ + List 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