From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java index 09dd59b..e36e21c 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java @@ -4,9 +4,9 @@ import com.doumee.config.annotation.CloudRequiredPermission; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; -import com.doumee.core.model.ApiResponse; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.ApiResponse; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.PlatformWaterGas; import com.doumee.dao.business.vo.PlatformWaterGasForExcelVO; @@ -87,14 +87,20 @@ public void exportExcel (@RequestBody PageWrap<PlatformWaterGas> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { List<PlatformWaterGas> waterGasPageData = platformWaterGasService.findPage(pageWrap).getRecords(); if(Objects.nonNull(pageWrap.getModel()) - && Objects.nonNull(pageWrap.getModel().getType()) && !Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO)){ + && Objects.nonNull(pageWrap.getModel().getType()) && !Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO)){ List<PlatformWaterGasForExcelVO> pageData = new ArrayList<>(); for (PlatformWaterGas platformWaterGas:waterGasPageData) { PlatformWaterGasForExcelVO platformWaterGasForExcelVO = new PlatformWaterGasForExcelVO(); BeanUtils.copyProperties(platformWaterGas,platformWaterGasForExcelVO); pageData.add(platformWaterGasForExcelVO); } - ExcelExporter.build(PlatformWaterGasForExcelVO.class).export(pageData, Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ZERO)?"鏈堝彴_鐢ㄦ按淇℃伅璁板綍琛�":"鏈堝彴_鐢ㄦ皵淇℃伅璁板綍琛�", response); + String title = "鏈堝彴_寰幆鐑熺璁板綍琛�"; + if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ZERO)){ + title = "鏈堝彴_鐢ㄦ按淇℃伅璁板綍琛�"; + }else if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ONE)){ + title = "鏈堝彴_鐢ㄦ皵淇℃伅璁板綍琛�"; + } + ExcelExporter.build(PlatformWaterGasForExcelVO.class).export(pageData, title, response); }else{ ExcelExporter.build(PlatformWaterGas.class).export(waterGasPageData, "鏈堝彴_娌硅�椾俊鎭褰曡〃", response); } -- Gitblit v1.9.3