From fc7ebc6bf97d7c4a4a8911c7a5d7cadcbda24719 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 12 六月 2025 17:41:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
index edb270a..928b664 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/controller/admin/DaPointController.java
@@ -138,16 +138,15 @@
@ApiAccessLog(operateType = EXPORT)
public void exportPointList(@Validated DaPointPageReqVO exportReqVO,
HttpServletResponse response) throws IOException {
- exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- List<DaPointExcelVO> dataList = new ArrayList<>();
- List<DaPointDTO> measurePointList = daPointService.getMeasurePoint(exportReqVO);
+ List<DaPointExcelVO> dataList = ConvertUtils.sourceToTarget(daPointService.getList(exportReqVO), DaPointExcelVO.class);
+ /*List<DaPointDTO> measurePointList = daPointService.getMeasurePoint(exportReqVO);
dataList.addAll(ConvertUtils.sourceToTarget(measurePointList, DaPointExcelVO.class));
List<DaPointDTO> mathPointList = daPointService.getMathPoint(exportReqVO);
dataList.addAll(ConvertUtils.sourceToTarget(mathPointList, DaPointExcelVO.class));
List<DaPointDTO> constantPointList = daPointService.getConstantPoint(exportReqVO);
dataList.addAll(ConvertUtils.sourceToTarget(constantPointList, DaPointExcelVO.class));
List<DaPointDTO> cumulatePointList = daPointService.getCumulatePoint(exportReqVO);
- dataList.addAll(ConvertUtils.sourceToTarget(cumulatePointList, DaPointExcelVO.class));
+ dataList.addAll(ConvertUtils.sourceToTarget(cumulatePointList, DaPointExcelVO.class));*/
ExcelUtils.write(response, "测点列表.xls", "测点列表", DaPointExcelVO.class, dataList);
}
--
Gitblit v1.9.3