From b437ca4b3ba3fadc821e4b01398c3257e540fcb7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 31 十二月 2024 14:40:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..4fd1a75 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
@@ -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