From d055077b3f4b7a1c0df851f4eb286959b53908e4 Mon Sep 17 00:00:00 2001 From: jing's Date: Tue, 19 Mar 2024 21:39:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/pojo/vo/ForwardReportExcelVO.java | 4 +- .../domain/EBom/EBomForwardReport.java | 134 ++++++++++-------- .../OriginalBom/OriginalBomForwardReport.java | 6 +- .../domain/PBom/PBomForwardReport.java | 128 +++++++++-------- 4 files changed, 153 insertions(+), 119 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ForwardReportExcelVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ForwardReportExcelVO.java index 80809222..7ab95606 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ForwardReportExcelVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ForwardReportExcelVO.java @@ -71,10 +71,10 @@ public class ForwardReportExcelVO { private BigDecimal totalWeight; - @ExcelColumn("创建时间") + @ExcelColumn(value = "创建时间",format = "yyyy-MM-dd hh:mm:ss") private LocalDateTime createdTime; - @ExcelColumn("版本过期时间") + @ExcelColumn(value = "版本过期时间",format = "yyyy-MM-dd hh:mm:ss") private LocalDateTime expireEndTime; @ExcelColumn("设计人员") diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java index 52f92f93..a0821a6c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java @@ -51,28 +51,30 @@ public class EBomForwardReport extends BaseForwardReport { } if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.NEW.getValue()) == 0) { queryWrapper.lambda().eq(BomNewEbomParentFormalEntity::getCurrentVersion, getMaxVersion()); - } else { + } else if(query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.DEFINE.getValue()) == 0) { queryWrapper.lambda().eq(BomNewEbomParentFormalEntity::getCurrentVersion, query.getBomVersion()); } if (StrUtil.isNotBlank(query.getStartDate()) && StrUtil.isNotBlank(query.getEndDate())) { - queryWrapper.lambda().between(BomNewEbomParentFormalEntity::getConvertToEbomTime, query.getStartDate(), query.getEndDate()); + queryWrapper.lambda().ge(BomNewEbomParentFormalEntity::getCreatedTime, query.getStartDate()) + .le(BomNewEbomParentFormalEntity::getConvertToEbomTime, query.getEndDate()); + + } return queryWrapper; } - BomNewEbomParentFormalEntity getParent() { + List getParent() { QueryWrapper queryWrapper = buildQuery(); List list = SpringUtil.getBean(BomNewEbomParentFormalService.class).list(queryWrapper); if (CollectionUtil.isEmpty(list)) { throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo())); } - BomNewEbomParentFormalEntity parentFormal = list.get(0); - parentFormal.setLevelNum(null); - parentFormal.setOrderNumber(null); - return parentFormal; + + + return list; } /** @@ -103,37 +105,42 @@ public class EBomForwardReport extends BaseForwardReport { */ ReportBomVO singleReport() { - BomNewEbomParentFormalEntity parentFormal = getParent(); - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal); - forwardReportVO.setCreatedTime(parentFormal.getConvertToEbomTime()); + List listParent=getParent(); + BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0); + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); - List list = SpringUtil.getBean(BomNewEbomParentFormalService.class).getBaseMapper().getParentChild(parentFormal.getRowId()); - initMaterialInfo(list); - List nodeList = null; + List nodesList = new ArrayList<>(); + for(BomNewEbomParentFormalEntity parentFormal:listParent) { - if (CollectionUtil.isNotEmpty(list)) { - nodeList = Convert.convert(new TypeReference>() { - }, list); - AtomicInteger orderNum = new AtomicInteger(); - for (ForwardReportVO vo : - nodeList) { - // vo.setCreatedTime(forwardReportVO.getCreatedTime()); - vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); - vo.setLevelNum(1); - vo.setOrderNumber(orderNum.incrementAndGet() + ""); - vo.setDeviseName(forwardReportVO.getDeviseName()); - vo.setCurrentVersion(forwardReportVO.getCurrentVersion()); + List list = SpringUtil.getBean(BomNewEbomParentFormalService.class).getBaseMapper().getParentChild(parentFormal.getRowId()); + initMaterialInfo(list); + if (CollectionUtil.isNotEmpty(list)) { + + List nodeList = Convert.convert(new TypeReference>() { + }, list); + AtomicInteger orderNum = new AtomicInteger(); + for (ForwardReportVO vo : + nodeList) { + // vo.setCreatedTime(forwardReportVO.getCreatedTime()); + vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); + vo.setLevelNum(1); + vo.setOrderNumber(orderNum.incrementAndGet() + ""); + vo.setDeviseName(forwardReportVO.getDeviseName()); + vo.setCurrentVersion(forwardReportVO.getCurrentVersion()); + + } + nodesList.addAll(nodeList); + + // Collections.sort(nodeList, (option0, option1) -> option0.getOrderNumber().compareTo(option1.getOrderNumber())); + } - - // Collections.sort(nodeList, (option0, option1) -> option0.getOrderNumber().compareTo(option1.getOrderNumber())); - } - return buildReportBomVo(forwardReportVO,nodeList); + return buildReportBomVo(forwardReportVO,nodesList); } @@ -199,28 +206,37 @@ public class EBomForwardReport extends BaseForwardReport { * @return */ ReportBomVO multiReport() { - BomNewEbomParentFormalEntity parentFormal = getParent(); - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal); - forwardReportVO.setCreatedTime(parentFormal.getConvertToEbomTime()); + + List listParent=getParent(); + BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0); + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); + + + List nodesList=new ArrayList<>(); + for(BomNewEbomParentFormalEntity parentFormal :listParent){ + List bomList = bomDetailList(parentFormal.getRowId()); List convertBomList = Convert.convert(new TypeReference>() { }, bomList); sumLevel(convertBomList); - List rootList; - //转化为树结构 - rootList = showDataStyle(convertBomList, parentFormal.getRowId()); - for (ForwardReportVO vo : - rootList) { - vo.setDeviseName(forwardReportVO.getDeviseName()); + //转化为树结构 + List nodeList = showDataStyle(convertBomList, parentFormal.getRowId()); + nodesList.addAll(nodeList); + for (ForwardReportVO vo : + nodeList) { + + vo.setDeviseName(parentFormal.getDeviseName()); vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); } - return buildReportBomVo(forwardReportVO,rootList,query.getDataType()); + + } + return buildReportBomVo(forwardReportVO,nodesList,query.getDataType()); } @@ -233,35 +249,35 @@ public class EBomForwardReport extends BaseForwardReport { * @return */ ReportBomVO sumReport() { + List listParent=getParent(); + BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0); + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); - BomNewEbomParentFormalEntity parentFormal = getParent(); + List nodesList=new ArrayList<>(); + for(BomNewEbomParentFormalEntity parentFormal :listParent) { + List bomList = bomDetailList(parentFormal.getRowId()); + List convertBomList = Convert.convert(new TypeReference>() { + }, bomList); - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal); - forwardReportVO.setCreatedTime(parentFormal.getConvertToEbomTime()); + sumLevel(convertBomList); - List bomList = bomDetailList(parentFormal.getRowId()); - List convertBomList = Convert.convert(new TypeReference>() { - }, bomList); + //无子级的数据 + List nodeList = leafMergeMaterialNo(convertBomList); - sumLevel(convertBomList); - - //无子级的数据 - List sumList =leafMergeMaterialNo(convertBomList); - - AtomicInteger orderNum = new AtomicInteger(); - for (ForwardReportVO vo : - sumList) { - - vo.setLevelNum(1); - vo.setOrderNumber(orderNum.incrementAndGet() + ""); - vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); + nodesList.addAll(nodeList); + AtomicInteger orderNum = new AtomicInteger(); + for (ForwardReportVO vo : + nodeList) { + vo.setLevelNum(1); + vo.setOrderNumber(orderNum.incrementAndGet() + ""); + vo.setExpireEndTime(parentFormal.getConvertToEbomTime()); vo.setDeviseName(forwardReportVO.getDeviseName()); - + } } - return buildReportBomVo(forwardReportVO,sumList); + return buildReportBomVo(forwardReportVO,nodesList); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomForwardReport.java index 06fc3406..88dfb4f5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomForwardReport.java @@ -48,7 +48,11 @@ public class OriginalBomForwardReport extends BaseForwardReport { queryWrapper.lambda().eq(BomNewOriginalParentEntity::getLastVersionIs,1); queryWrapper.lambda().eq(BomNewOriginalParentEntity::getStatus, OriginalStatusEnum.OVER_CONVERT.getValue()); if (StrUtil.isNotBlank(query.getStartDate()) && StrUtil.isNotBlank(query.getEndDate())) { - queryWrapper.lambda().between(BomNewOriginalParentEntity::getConvertToEbomTime, query.getStartDate(), query.getEndDate()); + + queryWrapper.lambda().ge(BomNewOriginalParentEntity::getCreatedTime,query.getStartDate()) + .le(BomNewOriginalParentEntity::getConvertToEbomTime, query.getEndDate()); + + } return queryWrapper; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java index 6db266ce..98967b78 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java @@ -55,27 +55,29 @@ public class PBomForwardReport extends BaseForwardReport { if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.NEW.getValue()) == 0) { queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getCurrentVersion, getMaxVersion()); - } else { + } else if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.DEFINE.getValue() ) == 0){ queryWrapper.lambda().eq(BomNewPbomParentFormalEntity::getCurrentVersion, query.getBomVersion()); } if (StrUtil.isNotBlank(query.getStartDate()) && StrUtil.isNotBlank(query.getEndDate())) { - queryWrapper.lambda().between(BomNewPbomParentFormalEntity::getReleaseTime, query.getStartDate(), query.getEndDate()); + + queryWrapper.lambda().ge(BomNewPbomParentFormalEntity::getCreatedTime, query.getStartDate()) + .le(BomNewPbomParentFormalEntity::getReleaseTime, query.getEndDate()); + } return queryWrapper; } - BomNewPbomParentFormalEntity getParent() { + List getParent() { QueryWrapper queryWrapper = buildQuery(); List list = SpringUtil.getBean(BomNewPbomParentFormalService.class).list(queryWrapper); if (CollectionUtil.isEmpty(list)) { throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("未查到物料编码为{}的数据信息", query.getMaterialNo())); } - BomNewPbomParentFormalEntity parentFormal = list.get(0); - parentFormal.setLevelNum(null); - parentFormal.setOrderNumber(null); - return parentFormal; + + + return list; } /** @@ -105,28 +107,28 @@ public class PBomForwardReport extends BaseForwardReport { */ ReportBomVO singleReport() { - BomNewPbomParentFormalEntity parentFormal = getParent(); + List< BomNewPbomParentFormalEntity> listParent=getParent(); + BomNewPbomParentFormalEntity parentFormal0=listParent.get(0); + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal); - forwardReportVO.setCreatedTime(parentFormal.getReleaseTime()); - - -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.lambda().eq(BomNewPbomChildFormalEntity::getParentRowId, parentFormal.getRowId()); -// List list = SpringUtil.getBean(BomNewPbomChildFormalService.class).list(queryWrapper); + List nodesList=new ArrayList<>(); + for (BomNewPbomParentFormalEntity parentFormal: + listParent ) { + List list = SpringUtil.getBean(BomNewPbomParentFormalService.class).getBaseMapper().getParentChild(parentFormal.getRowId()); initMaterialInfo(list); - List nodeList=null; + if (CollectionUtil.isNotEmpty(list)) { - nodeList = Convert.convert(new TypeReference>() { + List nodeList = Convert.convert(new TypeReference>() { }, list); - int noNum=1; + nodesList.addAll(nodeList); + int noNum=1; for (ForwardReportVO vo : nodeList) { - vo.setCreatedTime(forwardReportVO.getCreatedTime()); + vo.setExpireEndTime(parentFormal.getReleaseTime()); vo.setDeviseName(forwardReportVO.getDeviseName()); vo.setCurrentVersion(forwardReportVO.getCurrentVersion()); @@ -138,7 +140,9 @@ public class PBomForwardReport extends BaseForwardReport { } - return buildReportBomVo(forwardReportVO,nodeList); + + } + return buildReportBomVo(forwardReportVO,nodesList); } void initMaterialInfo( List list){ @@ -208,37 +212,42 @@ public class PBomForwardReport extends BaseForwardReport { * @return */ ReportBomVO multiReport() { - BomNewPbomParentFormalEntity parentFormal = getParent(); - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal); - forwardReportVO.setCreatedTime(parentFormal.getReleaseTime()); + List< BomNewPbomParentFormalEntity> listParent=getParent(); + + BomNewPbomParentFormalEntity parentFormal0=listParent.get(0); + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); + + List nodesList=new ArrayList<>(); + for (BomNewPbomParentFormalEntity parentFormal: + listParent ) { + List bomList = bomDetailList(parentFormal.getRowId()); - List bomList = bomDetailList(parentFormal.getRowId()); - - List convertBomList = Convert.convert(new TypeReference>() { - }, bomList); + List convertBomList = Convert.convert(new TypeReference>() { + }, bomList); - sumLevel(convertBomList); - //转化为树结构 - List rootList = showDataStyle(convertBomList, parentFormal.getRowId()); + sumLevel(convertBomList); + //转化为树结构 + List nodeList = showDataStyle(convertBomList, parentFormal.getRowId()); + nodesList.addAll(nodeList); + + for (ForwardReportVO vo : + nodeList) { - for (ForwardReportVO vo : - rootList) { + vo.setDeviseName(parentFormal.getDeviseName()); + vo.setCreatedTime(parentFormal.getCreatedTime()); + vo.setExpireEndTime(parentFormal.getReleaseTime()); - - vo.setDeviseName(forwardReportVO.getDeviseName()); - vo.setCreatedTime(parentFormal.getCreatedTime()); - vo.setExpireEndTime(parentFormal.getReleaseTime()); + } } - - return buildReportBomVo(forwardReportVO,rootList,query.getDataType()); + return buildReportBomVo(forwardReportVO,nodesList,query.getDataType()); } @@ -249,30 +258,35 @@ public class PBomForwardReport extends BaseForwardReport { * @return */ ReportBomVO sumReport() { - BomNewPbomParentFormalEntity parentFormal = getParent(); + List< BomNewPbomParentFormalEntity> listParent=getParent(); + + BomNewPbomParentFormalEntity parentFormal0=listParent.get(0); + ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0); + + List nodesList=new ArrayList<>(); + for (BomNewPbomParentFormalEntity parentFormal: + listParent ) { - ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal); - forwardReportVO.setCreatedTime(parentFormal.getReleaseTime()); + List bomList = bomDetailList(parentFormal.getRowId()); + List convertBomList = Convert.convert(new TypeReference>() { + }, bomList); - List bomList = bomDetailList(parentFormal.getRowId()); - List convertBomList = Convert.convert(new TypeReference>() { - }, bomList); - - sumLevel(convertBomList); - List sumList =leafMergeMaterialNo(convertBomList); - int noNum=1; - for(ForwardReportVO vo:sumList){ - vo.setOrderNumber(noNum+"");noNum++; + sumLevel(convertBomList); + List nodeList = leafMergeMaterialNo(convertBomList); + nodesList.addAll(nodeList); + int noNum = 1; + for (ForwardReportVO vo : nodeList) { + vo.setOrderNumber(noNum + ""); + noNum++; + vo.setDeviseName(forwardReportVO.getDeviseName()); + vo.setCreatedTime(parentFormal.getCreatedTime()); + vo.setExpireEndTime(parentFormal.getReleaseTime()); + } - vo.setDeviseName(forwardReportVO.getDeviseName()); - - vo.setCreatedTime(parentFormal.getCreatedTime()); - vo.setExpireEndTime(parentFormal.getReleaseTime()); - } - - return buildReportBomVo(forwardReportVO,sumList); + } + return buildReportBomVo(forwardReportVO,nodesList); }