From d22ef821a9c66b0ea8dc5590990d6cc8f66b3080 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 26 Sep 2023 10:28:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BA=A4=E4=BB=98?= =?UTF-8?q?=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLawsInventoryEOServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 582ccdfdd..c8c2b6595 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -9918,6 +9918,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Tue, 26 Sep 2023 10:46:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 46 ++++++++++++++----- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index 712f7eee0..6b8908ef6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -35,11 +35,9 @@ import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryE import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService; import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService; import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO; -import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn; import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEnPlatform; import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOPlatform; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; -import com.jero.modules.project.entity.ProjectCertificationInventoryEOEn; import com.jero.modules.project.entity.ProjectCertificationInventoryEOEnPlatform; import com.jero.modules.project.entity.ProjectCertificationInventoryEOPlatform; import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO; @@ -5529,26 +5527,50 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) || ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){ - workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOPlatform.class, copy); + List projectCertificationInventoryDutyEnginnerEOPlatformList = new ArrayList<>(); + for (ProjectCertificationInventoryDutyEnginnerEO projectCertificationInventoryDutyEnginnerEO : copy) { + ProjectCertificationInventoryDutyEnginnerEOPlatform projectCertificationInventoryDutyEnginnerEOPlatform = new ProjectCertificationInventoryDutyEnginnerEOPlatform(); + BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEO,projectCertificationInventoryDutyEnginnerEOPlatform); + projectCertificationInventoryDutyEnginnerEOPlatformList.add(projectCertificationInventoryDutyEnginnerEOPlatform); + } + workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOPlatform.class, projectCertificationInventoryDutyEnginnerEOPlatformList); }else{ - workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOPlatform.class, dataList); + List projectCertificationInventoryEOPlatformList = new ArrayList<>(); + for (ProjectCertificationInventoryEO certificationInventoryEO : dataList) { + ProjectCertificationInventoryEOPlatform projectCertificationInventoryEOPlatform = new ProjectCertificationInventoryEOPlatform(); + BeanUtils.copyProperties(certificationInventoryEO,projectCertificationInventoryEOPlatform); + projectCertificationInventoryEOPlatformList.add(projectCertificationInventoryEOPlatform); + } + workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOPlatform.class, projectCertificationInventoryEOPlatformList); } }else{ if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) || ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){ - List copyEn = new ArrayList<>(); +// List copyEn = new ArrayList<>(); +// for (ProjectCertificationInventoryDutyEnginnerEO projectCertificationInventoryDutyEnginnerEOTemp : copy) { +// ProjectCertificationInventoryDutyEnginnerEOEn projectCertificationInventoryDutyEnginnerEOEn = new ProjectCertificationInventoryDutyEnginnerEOEn(); +// BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEn); +// copyEn.add(projectCertificationInventoryDutyEnginnerEOEn); +// } + List copyEn = new ArrayList<>(); for (ProjectCertificationInventoryDutyEnginnerEO projectCertificationInventoryDutyEnginnerEOTemp : copy) { - ProjectCertificationInventoryDutyEnginnerEOEn projectCertificationInventoryDutyEnginnerEOEn = new ProjectCertificationInventoryDutyEnginnerEOEn(); - BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEn); - copyEn.add(projectCertificationInventoryDutyEnginnerEOEn); + ProjectCertificationInventoryDutyEnginnerEOEnPlatform projectCertificationInventoryDutyEnginnerEOEnPlatform = new ProjectCertificationInventoryDutyEnginnerEOEnPlatform(); + BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEnPlatform); + copyEn.add(projectCertificationInventoryDutyEnginnerEOEnPlatform); } workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOEnPlatform.class, copyEn); }else{ - List dataListEn = new ArrayList<>(); +// List dataListEn = new ArrayList<>(); +// for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) { +// ProjectCertificationInventoryEOEn projectCertificationInventoryEOEn = new ProjectCertificationInventoryEOEn(); +// BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEn); +// dataListEn.add(projectCertificationInventoryEOEn); +// } + List dataListEn = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) { - ProjectCertificationInventoryEOEn projectCertificationInventoryEOEn = new ProjectCertificationInventoryEOEn(); - BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEn); - dataListEn.add(projectCertificationInventoryEOEn); + ProjectCertificationInventoryEOEnPlatform projectCertificationInventoryEOEnPlatform = new ProjectCertificationInventoryEOEnPlatform(); + BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEnPlatform); + dataListEn.add(projectCertificationInventoryEOEnPlatform); } //下拉选中英文转换 // transition(dataListEn,projectCertificationInventoryEO);