From 23b55e23dda61cfcc8345b03606e293e5665126e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 28 Jun 2024 08:43:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E5=AF=BC=E5=87=BA=E5=88=B0excel?= =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E9=80=89=E4=B8=AD=E7=9A=84=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/pojo/vo/EbomExcelVO.java | 3 ++- .../bomnew/service/BomNewEbomParentService.java | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java index b16b7707..8236f992 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java @@ -20,7 +20,8 @@ import java.util.Objects; @Data public class EbomExcelVO { - + @ExcelColumn("层级") + private Integer level; @ExcelColumn("物料编码") private String materialNo; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 29500efe..6d899d2d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -1188,8 +1188,18 @@ public class BomNewEbomParentService extends ServiceImpl bomRowIds, HttpServletResponse response) throws IOException { List child = getChildBatch(bomRowIds); - final ListSheet listSheet = new ListSheet<>(Convert.toList(EbomExcelVO.class, child)); - EecExcelUtil.eecExcel("bom列表", listSheet, response); + List parents = baseMapper.selectBatchIds(bomRowIds); + List datas = parents.stream().map(p -> { + EbomExcelVO vo = Convert.convert(EbomExcelVO.class, p); + vo.setLevel(1); + return vo; + }).collect(Collectors.toList()); + datas.addAll(child.stream().map(c -> { + EbomExcelVO vo = Convert.convert(EbomExcelVO.class, c); + vo.setLevel(2); + return vo; + }).collect(Collectors.toList())); + EecExcelUtil.eecExcel("bom列表", new ListSheet<>(datas), response); }