From ae7de194986266e65154dcb15f6e9206192b5090 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Sun, 10 Mar 2024 16:33:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E8=BE=83=E5=AF=BC=E5=87=BAexcel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/excel/CompareReportField.java      | 57 +++++++++++++++++++
 .../bomnew/excel/ExportDeviceHelper.java      |  3 +
 .../bomnew/service/CompareReportService.java  | 29 ++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/CompareReportField.java

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/CompareReportField.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/CompareReportField.java
new file mode 100644
index 00000000..ef3ba1e7
--- /dev/null
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/CompareReportField.java
@@ -0,0 +1,57 @@
+package com.nflg.product.bomnew.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.File;
+import java.math.BigDecimal;
+
+@Data
+public class CompareReportField {
+
+//    @ApiModelProperty("汇总")
+//    @ExcelProperty(value="汇总")
+//    private Integer levelNum;
+
+    @ApiModelProperty("物料编码")
+    @ExcelProperty(value="物料编码")
+    private String materialNo;
+    @ApiModelProperty("图号")
+    @ExcelProperty(value="图号")
+    private   String drawingNo;
+
+
+    @ApiModelProperty("物料描述")
+    @ExcelProperty(value="物料描述")
+    private String materialDesc;
+
+    @ApiModelProperty("数量")
+    @ExcelProperty(value = "数量")
+    private BigDecimal num;
+
+    @ApiModelProperty("单位")
+    @ExcelProperty(value = "单位")
+    private String materialUnit;
+    @ApiModelProperty("层级")
+    @ExcelProperty(value="层级")
+    private Integer levelNum;
+
+    @ApiModelProperty("比对结果")
+    @ExcelProperty("比对结果")
+    private File compareSymbol;
+
+
+
+
+    @ApiModelProperty("数量")
+    @ExcelProperty(value = "数量")
+    private BigDecimal num2;
+    @ApiModelProperty("单位")
+    @ExcelProperty(value = "单位")
+    private String materialUnit2;
+    @ApiModelProperty("层级")
+    @ExcelProperty(value="层级")
+    private Integer levelNum2;
+
+}
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 85c6c579..73521db7 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
@@ -29,6 +29,9 @@ import java.io.OutputStream;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
+/**'
+ * 移动破导出设备
+ */
 public class ExportDeviceHelper {
 
 
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 83fe76f9..d472b578 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
@@ -1,10 +1,12 @@
 package com.nflg.product.bomnew.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.nflg.product.bomnew.constant.ReportConstant;
+import com.nflg.product.bomnew.excel.CompareReportField;
 import com.nflg.product.bomnew.pojo.query.CompareReportQuery;
 
 import com.nflg.product.bomnew.pojo.vo.CompareReportListVO;
@@ -53,6 +55,33 @@ public class CompareReportService {
         return compareReportListVO;
     }
 
+
+
+    public void compareBomExport(CompareReportQuery query) {
+        CompareReportListVO list=compareBom(query);
+
+    if(CollUtil.isEmpty(list.getChildNodes())){
+        return;
+    }
+
+        for (CompareReportVO compareReportVO:
+        list.getChildNodes()) {
+
+            CompareReportField   compareReportField=null;
+        if(compareReportVO.getLeft()!=null){
+            compareReportField= Convert.convert(CompareReportField.class,compareReportVO.getLeft());
+        }
+
+
+        }
+
+
+
+    }
+
+
+
+
     /**
      * 左倾斜 或右倾斜
      * @param leftNode