From 963062bee5180253a9ba95a5d82c3a8152be60f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 27 Jun 2024 17:25:34 +0800 Subject: [PATCH] =?UTF-8?q?optimize:=20bom=E6=AF=94=E8=BE=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加非null判断 --- .../bomnew/service/CompareReportService.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java index b381ae6a..3c002ec4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java @@ -2,25 +2,21 @@ package com.nflg.product.bomnew.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.TypeReference; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.support.ExcelTypeEnum; import com.nflg.product.bomnew.constant.ReportConstant; -import com.nflg.product.bomnew.pojo.vo.*; import com.nflg.product.bomnew.pojo.query.CompareReportQuery; - +import com.nflg.product.bomnew.pojo.vo.*; import com.nflg.product.bomnew.util.EecExcelUtil; import com.nflg.product.bomnew.util.VUtils; - import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; -import org.springframework.util.FileCopyUtils; import org.ttzero.excel.entity.ListSheet; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -39,6 +35,10 @@ public class CompareReportService { ReportBomVO left = SpringUtil.getBean(ForwardReportService.class).factoryBomType(query.getLeft()); ReportBomVO right = SpringUtil.getBean(ForwardReportService.class).factoryBomType(query.getRight()); + VUtils.isTure(Objects.isNull(left) && Objects.isNull(right)).throwMessage("两边的物料都未查到，无需比较"); + VUtils.isTure(Objects.isNull(left)).throwMessage("未找到左边物料信息"); + VUtils.isTure(Objects.isNull(right)).throwMessage("未找到右边物料信息"); + if (CollUtil.isEmpty(left.getChildNodes()) && CollUtil.isEmpty(right.getChildNodes())) { VUtils.isTure(true).throwMessage(StrUtil.format("{}和{}下无物料数据 ", left.getParent().getMaterialNo(), right.getParent().getMaterialNo())); }