From a5db57778565f91ad97eae2b9c1ab02011c50b09 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 9 Jun 2023 14:55:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=AD=97=E5=85=B8=E5=AF=BC=E5=87=BAid=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/basic/BasicGenExcelService.java | 6 ++++-- .../com/glxp/api/controller/basic/BasicGenJsonService.java | 6 ++++-- .../com/glxp/api/req/basic/BasicCorpsExportRequest.java | 2 +- .../glxp/api/req/basic/BasicUnitMaintainFilterRequest.java | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java index 7b31b1de..52e1079f 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java @@ -84,8 +84,10 @@ public class BasicGenExcelService { excelData.add(head); //选中导出 if (basicCorpsExportRequest.getIds() != null && basicCorpsExportRequest.getIds().size() > 0) { - List ids = basicCorpsExportRequest.getIds(); - for (Integer id : ids) { +// List ids = basicCorpsExportRequest.getIds(); + List ids =basicCorpsExportRequest.getIds(); + + for (Long id : ids) { BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest(); filterRequest.setId(id); List> genDatas = genExcelData(filterRequest); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java index 3f4ebca9..89c145e1 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java @@ -67,7 +67,8 @@ public class BasicGenJsonService { List unitMaintainEntities = new ArrayList<>(); if (basicCorpsExportRequest.getIds() != null && basicCorpsExportRequest.getIds().size() > 0) { - List ids = basicCorpsExportRequest.getIds(); +// List ids = basicCorpsExportRequest.getIds(); + List ids = basicCorpsExportRequest.getIds(); ids.forEach(id -> { BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest(); request.setId(id); @@ -97,7 +98,8 @@ public class BasicGenJsonService { BasicCorpExportLogResponse exportData = new BasicCorpExportLogResponse(); List unitMaintainEntities = new ArrayList<>(); if (corpsExportRequest.getIds() != null && corpsExportRequest.getIds().size() > 0) { - List ids = corpsExportRequest.getIds(); +// List ids = corpsExportRequest.getIds(); + List ids = corpsExportRequest.getIds(); ids.forEach(id -> { BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest(); request.setId(id); diff --git a/src/main/java/com/glxp/api/req/basic/BasicCorpsExportRequest.java b/src/main/java/com/glxp/api/req/basic/BasicCorpsExportRequest.java index 94e8a7b8..72a8f1b9 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicCorpsExportRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicCorpsExportRequest.java @@ -6,7 +6,7 @@ import java.util.List; @Data public class BasicCorpsExportRequest { - List ids; + List ids; private Integer id; private String key; private String unitId; diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java index 1a9f08dd..679c7261 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java @@ -9,7 +9,7 @@ import java.util.List; @Data public class BasicUnitMaintainFilterRequest extends ListPageRequest { - private Integer id; + private Long id; private String key; private String unitId; private String name;