From 818564eaa36eb288d967a5dc83af04f9f85280a7 Mon Sep 17 00:00:00 2001 From: jing's Date: Fri, 21 Jun 2024 15:17:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=AF=BC=E5=87=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/excel/ExportDeviceHelper.java | 15 ++++++++++++++- .../mapper/master/OptionalEbomConfigMapper.xml | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java index 9cf460aa..054b2ebd 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java @@ -1,5 +1,6 @@ package com.nflg.product.bomnew.excel; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; @@ -19,6 +20,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; import com.nflg.product.bomnew.pojo.vo.*; +import com.nflg.product.bomnew.util.VUtils; import org.apache.poi.ss.usermodel.*; import com.alibaba.excel.write.merge.OnceAbsoluteMergeStrategy; import org.apache.poi.ss.util.CellRangeAddress; @@ -353,7 +355,8 @@ public class ExportDeviceHelper { public void buildList(List listTable, WriteSheet sheet, ExcelWriter writer, AtomicInteger tableNoCounting) { if (CollectionUtil.isEmpty(listTable)) { - return; + VUtils.isTure(true).throwMessage("设备下无数据"); + } List items = new ArrayList<>(); @@ -368,11 +371,21 @@ public class ExportDeviceHelper { List list2 = item1.getChild(); + if(CollUtil.isEmpty(list2)){ + continue; + } + for (OptionalEbomImportVO item2 : list2) { { String opChildName = item2.getOptionName(); String optionChildDrawingNo = item2.getOptionDrawingNo(); List list3 = item2.getChild(); + + if(CollUtil.isEmpty(list3)){ + continue; + } + + for (OptionalEbomImportChildVO item3 : list3) { ImportExcelField excelField = new ImportExcelField(); excelField.setCellFirst(StrUtil.format("{} {}",optionChildDrawingNo,opChildName)); diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml index 0ad9c8b1..ae0d9bd9 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml @@ -103,7 +103,7 @@ t1.choose_status, t2.choose_status as option_status from t_optional_ebom_config_r as t2 LEFT JOIN t_optional_ebom_import_child as t1 on t2.option_row_id=t1.row_id - where t1.is_enable=1 and t2.parent_row_id=#{rowId} + where t1.is_enable=1 and t1.is_del=0 and t2.parent_row_id=#{rowId} @@ -131,7 +131,7 @@ t1.choose_status, t2.choose_status as option_status from t_optional_ebom_config_r as t2 LEFT JOIN t_optional_ebom_import_child as t1 on t2.option_row_id=t1.row_id - where t1.is_enable=1 and t2.choose_status =1 and t2.parent_row_id=#{rowId} and t1.material_name!='无' + where t1.is_enable=1 and t1.is_del=0 and t2.choose_status =1 and t2.parent_row_id=#{rowId} and t1.material_name!='无'