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

设备导出异常

This commit is contained in:
jing's 2024-06-21 15:17:24 +08:00
parent 4f86a44420
commit 818564eaa3
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java
View File

@ -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<OptionalEbomImportVO> listTable, WriteSheet sheet, ExcelWriter writer, AtomicInteger tableNoCounting) {
if (CollectionUtil.isEmpty(listTable)) {
return;
VUtils.isTure(true).throwMessage("设备下无数据");
}
List<ImportExcelField> items = new ArrayList<>();
@ -368,11 +371,21 @@ public class ExportDeviceHelper {
List<OptionalEbomImportVO> list2 = item1.getChild();
if(CollUtil.isEmpty(list2)){
continue;
}
for (OptionalEbomImportVO item2 : list2) {
{
String opChildName = item2.getOptionName();
String optionChildDrawingNo = item2.getOptionDrawingNo();
List<OptionalEbomImportChildVO> list3 = item2.getChild();
if(CollUtil.isEmpty(list3)){
continue;
}
for (OptionalEbomImportChildVO item3 : list3) {
ImportExcelField excelField = new ImportExcelField();
excelField.setCellFirst(StrUtil.format("{} {}",optionChildDrawingNo,opChildName));

4
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml
View File

@ -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!='无'
</select>