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); }