rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimize: bom查看 

添加非null判断
This commit is contained in:
曹鹏飞 2024-06-27 16:52:44 +08:00
parent 9a92cb535d
commit 3942fb2a70
4 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java
View File

@ -1,6 +1,7 @@
package com.nflg.product.bomnew.api.user;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.util.ObjectUtil;
@ -230,18 +231,19 @@ public class BomReportApi extends BaseApi {
if (resultVO != null) {
VUtils.isTure(true).throwMessage(resultVO.getMsg());
}
List<ReverseReportVO> datas = null;
String name = "";
if (query.getBomType().equals(1)) {
EecExcelUtil.setResponseExcelHeader(response, "eBom反查列表");
List<ForwardReportExcelVO> exportList = Convert.convert(new TypeReference<List<ForwardReportExcelVO>>() {
}, reverseReportService.queryEBom(query));
ListSheet<ForwardReportExcelVO> listSheet = new ListSheet<>(exportList);
EecExcelUtil.eecExcel("eBom反查列表", listSheet, response);
name = "eBom反查列表";
datas = reverseReportService.queryEBom(query);
} else if (query.getBomType().equals(2)) {
EecExcelUtil.setResponseExcelHeader(response, "pBom反查列表");
List<ForwardReportExcelVO> exportList = Convert.convert(new TypeReference<List<ForwardReportExcelVO>>() {
}, reverseReportService.queryPBom(query));
ListSheet<ForwardReportExcelVO> listSheet = new ListSheet<>(exportList);
EecExcelUtil.eecExcel("pBom反查列表", listSheet, response);
name = "pBom反查列表";
datas = reverseReportService.queryPBom(query);
}
VUtils.isTure(CollUtil.isEmpty(datas)).throwMessage("没有需要导出的数据");
EecExcelUtil.setResponseExcelHeader(response, name);
List<ForwardReportExcelVO> exportList = Convert.convert(new TypeReference<List<ForwardReportExcelVO>>() {
}, datas);
EecExcelUtil.eecExcel(name, new ListSheet<>(exportList), response);
}
}

26
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java
View File

@ -1,16 +1,16 @@
package com.nflg.product.bomnew.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.nflg.product.bomnew.constant.EBomConstant;
import com.nflg.product.bomnew.constant.OriginalConstant;
import com.nflg.product.bomnew.constant.ReportConstant;
import com.nflg.product.bomnew.pojo.entity.*;
import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentFormalEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewMbomParentEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewOriginalParentEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentFormalEntity;
import com.nflg.product.bomnew.pojo.query.ChildBomReportQuery;
import com.nflg.product.bomnew.pojo.query.ReverseReportQuery;
import com.nflg.product.bomnew.pojo.vo.*;
@ -25,10 +25,8 @@ import com.nflg.product.bomnew.util.VUtils;
import org.springframework.stereotype.Service;
import org.ttzero.excel.entity.ListSheet;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.reflect.Type;
import java.util.*;
import java.util.stream.Collectors;
@ -115,7 +113,9 @@ public class ForwardReportService {
if (query.getBomType().compareTo(ReportConstant.BomTypeEnum.ORIGINALBOM.getValue()) == 0) {
OriginalBomForwardReport originalBomForwardReport=new OriginalBomForwardReport(query);
ReportBomVO reportBomVO = originalBomForwardReport.genReport();
exportExcel(reportBomVO.getChildNodes(),outputStream);
if (Objects.nonNull(reportBomVO)) {
exportExcel(reportBomVO.getChildNodes(), outputStream);
}
return;
}
@ -123,7 +123,9 @@ public class ForwardReportService {
if (query.getBomType().compareTo(ReportConstant.BomTypeEnum.EBOM.getValue()) == 0) {
EBomForwardReport eBomForwardReport = new EBomForwardReport(query);
ReportBomVO reportBomVO = eBomForwardReport.genReport();
exportExcel(reportBomVO.getChildNodes(),outputStream);
if (Objects.nonNull(reportBomVO)) {
exportExcel(reportBomVO.getChildNodes(), outputStream);
}
return;
}
@ -131,14 +133,18 @@ public class ForwardReportService {
if (query.getBomType().compareTo(ReportConstant.BomTypeEnum.PBOM.getValue()) == 0) {
PBomForwardReport pBomForwardReport=new PBomForwardReport(query);
ReportBomVO reportBomVO = pBomForwardReport.genReport();
exportExcel(reportBomVO.getChildNodes(),outputStream);
if (Objects.nonNull(reportBomVO)) {
exportExcel(reportBomVO.getChildNodes(), outputStream);
}
return;
}
//MBOM
if (query.getBomType().compareTo(ReportConstant.BomTypeEnum.MBOM.getValue()) == 0) {
MBomForwardReport mBomForwardReport=new MBomForwardReport(query);
ReportBomVO reportBomVO = mBomForwardReport.genReport();
exportExcel(reportBomVO.getChildNodes(),outputStream);
if (Objects.nonNull(reportBomVO)) {
exportExcel(reportBomVO.getChildNodes(), outputStream);
}
return;
}

12
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
View File

@ -82,6 +82,9 @@ public class EBomForwardReport extends BaseForwardReport {
*/
public String getMaxVersion() {
ReportBomVersionVO reportBomVersionVO = bomVersion();
if (CollUtil.isEmpty(reportBomVersionVO.getVList())) {
return "";
}
if (reportBomVersionVO.getVList().size() == 1) {
return reportBomVersionVO.getVList().get(0).getVersion();
}
@ -104,6 +107,9 @@ public class EBomForwardReport extends BaseForwardReport {
ReportBomVO singleReport() {
List<BomNewEbomParentFormalEntity> listParent = getParent();
if (CollUtil.isEmpty(listParent)) {
return null;
}
BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0);
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
@ -243,6 +249,9 @@ public class EBomForwardReport extends BaseForwardReport {
List<BomNewEbomParentFormalEntity> listParent = getParent();
if (CollUtil.isEmpty(listParent)) {
return null;
}
BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0);
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
@ -285,6 +294,9 @@ public class EBomForwardReport extends BaseForwardReport {
*/
ReportBomVO sumReport() {
List<BomNewEbomParentFormalEntity> listParent = getParent();
if (CollUtil.isEmpty(listParent)) {
return null;
}
BomNewEbomParentFormalEntity parentFormal0 = listParent.get(0);
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);

12
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
View File

@ -108,7 +108,9 @@ public class PBomForwardReport extends BaseForwardReport {
ReportBomVO singleReport() {
List< BomNewPbomParentFormalEntity> listParent=getParent();
if (CollUtil.isEmpty(listParent)) {
return null;
}
BomNewPbomParentFormalEntity parentFormal0=listParent.get(0);
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
@ -242,7 +244,9 @@ public class PBomForwardReport extends BaseForwardReport {
List< BomNewPbomParentFormalEntity> listParent=getParent();
if (CollUtil.isEmpty(listParent)) {
return null;
}
BomNewPbomParentFormalEntity parentFormal0=listParent.get(0);
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);
@ -289,7 +293,9 @@ public class PBomForwardReport extends BaseForwardReport {
*/
ReportBomVO sumReport() {
List< BomNewPbomParentFormalEntity> listParent=getParent();
if (CollUtil.isEmpty(listParent)) {
return null;
}
BomNewPbomParentFormalEntity parentFormal0=listParent.get(0);
ForwardReportVO forwardReportVO = Convert.convert(ForwardReportVO.class, parentFormal0);