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/controller/ControllerCtrl.java | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java index e8a1df2..c68002e 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java @@ -1,13 +1,14 @@ package com.dy.pipIrrProject.controller; -import com.alibaba.fastjson2.JSONArray; import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.support.ExcelTypeEnum; +import com.alibaba.fastjson2.JSONArray; 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.pojoBa.BaClient; import com.dy.pipIrrGlobal.pojoPr.PrController; import com.dy.pipIrrGlobal.voPr.VoController; @@ -32,6 +33,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.time.LocalDate; import java.util.*; /** @@ -224,15 +226,19 @@ @SneakyThrows(IOException.class) @RequestMapping(value = "/export", method = RequestMethod.GET) public void export(HttpServletResponse response, QueryVo vo) { - setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�"); - //List<VoDivide> memberList = LocalJsonUtil.getListFromJson("json/members.json", VoDivide.class); - List<VoController> memberList = controllerSv.export(vo); + //setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�"); + List<VoController> controllerList = controllerSv.export(vo); + ExcelUtil.setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�" + LocalDate.now()); + EasyExcel.write(response.getOutputStream(), VoController.class) + .registerWriteHandler(new CellWriteHandler("鎺у埗鍣ㄥ垪琛�")) + .sheet("鎺у埗鍣�") + .doWrite(controllerList); - EasyExcel.write(response.getOutputStream()) - .head(VoController.class) - .excelType(ExcelTypeEnum.XLSX) - .sheet("鎺у埗鍣ㄥ垪琛�") - .doWrite(memberList); + //EasyExcel.write(response.getOutputStream()) + // .head(VoController.class) + // .excelType(ExcelTypeEnum.XLSX) + // .sheet("鎺у埗鍣ㄥ垪琛�") + // .doWrite(memberList); } /** -- Gitblit v1.8.0