From 2a959177f1adcd36f790e14718bbd116752e5c64 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期六, 12 十月 2024 17:19:10 +0800 Subject: [PATCH] 2024-10-12 朱宝民 优化交易明细导出、取水口导出、阀控器导出 --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java index 44694c6..57b5513 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java @@ -1,12 +1,13 @@ package com.dy.pipIrrProject.intake; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.support.ExcelTypeEnum; import com.dy.common.aop.SsoAop; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; import com.dy.common.webUtil.QueryResultVo; import com.dy.common.webUtil.ResultCodeMsg; +import com.dy.pipIrrGlobal.excel.CellWriteHandler; +import com.dy.pipIrrGlobal.excel.ExcelUtil; import com.dy.pipIrrGlobal.pojoPr.PrIntake; import com.dy.pipIrrGlobal.voPr.VoIntake; import com.dy.pipIrrGlobal.voPr.VoOnLineIntake; @@ -35,6 +36,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.*; @@ -240,8 +242,6 @@ log.error("淇濆瓨鍒嗘按鍙e紓甯�", e); return BaseResponseUtils.buildException(e.getMessage()); } - - } /** @@ -252,16 +252,15 @@ */ @SneakyThrows(IOException.class) @GetMapping(value = "exportIntakes") + @SsoAop() public void exportIntakes(HttpServletResponse response, QueryVo vo) { - setExcelRespProp(response, "鍙栨按鍙e垪琛�"); - //List<VoDivide> memberList = LocalJsonUtil.getListFromJson("json/members.json", VoDivide.class); - List<VoIntake> memberList = intakeSv.exportIntakes(vo); + List<VoIntake> intakeList = intakeSv.exportIntakes(vo); - EasyExcel.write(response.getOutputStream()) - .head(VoIntake.class) - .excelType(ExcelTypeEnum.XLSX) - .sheet("鍙栨按鍙e垪琛�") - .doWrite(memberList); + ExcelUtil.setExcelRespProp(response, "鍙栨按鍙e垪琛�" + LocalDate.now()); + EasyExcel.write(response.getOutputStream(), VoIntake.class) + .registerWriteHandler(new CellWriteHandler("鍙栨按鍙e垪琛�")) + .sheet("鍙栨按鍙�") + .doWrite(intakeList); } /** -- Gitblit v1.8.0