From 3c8085909d7de90b3fa544697b3a6578e3012dd7 Mon Sep 17 00:00:00 2001
From: chuang <994001556@qq.com>
Date: Sat, 25 Mar 2023 17:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/jnpf/mobilePort/utils/FileCopy.java | 11 ++++-------
 .../controller/PurchaseorderController.java           |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java
index 5e9f98d7..74f189cd 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java
@@ -131,9 +131,6 @@ public class FileCopy {
 //                   销售合同编码
                         String str3 = infoStr.substring(infoStr.lastIndexOf("：") + 1, infoStr.length());
                         List<Object> objects = reader.readColumn(0, 3);
-                        List<Object> setTextColumn = reader.readColumn(10, 3);
-
-//                        System.out.println(objects);
 //                    写入工具类
                         ExcelWriter writer = reader.getWriter();
 //                    Workbook workbook = writer.getWorkbook();
@@ -157,7 +154,7 @@ public class FileCopy {
 
                             Cell cell5 = row.getCell(9);
 
-                            if (i1 == (objects.size() - 1)) {
+                            if (i1 == 0) {
                                 row = sheet.getRow(2);
                                 cell = row.createCell(19);
                                 cell.setCellValue("榜单图片地址");
@@ -169,10 +166,10 @@ public class FileCopy {
                                 cell.setCellValue("采购合同编码");
                                 cell = row.createCell(18);
                                 cell.setCellValue("车辆图片地址");
-                            } else {
+                            }
+
                                 Object o1 = fileMap.get(String.valueOf(o));
                                 Object o2 = carFileMap.get(String.valueOf(o));
-
                                 cell.setCellValue(String.valueOf(o1).equals("null") ? "" : JsonUtil.getListToJsonArray((List<UploaderVO>)o1).toString());
                                 cell4.setCellValue(String.valueOf(o2).equals("null") ? "" :JsonUtil.getListToJsonArray((List<UploaderVO>)o2).toString());
                                 cell1.setCellValue(companyStr);
@@ -180,7 +177,7 @@ public class FileCopy {
                                 cell3.setCellValue(str3);
                                 cell5.setCellType(CellType.STRING);
                                 cell5.setCellValue(FileCopy.setSteColumn(cell5));
-                            }
+
                         }
                         writer.flush(excelFile);
                         writer.close();
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
index 0316caef..e5cf7c39 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
@@ -344,7 +344,6 @@ public class PurchaseorderController {
 
             @Cleanup InputStream inputStream = file.getInputStream();
             File gbk = ZipUtil.unzip(inputStream, temporaryFile, Charset.forName("GBK"));
-            HashMap<String, String> imgMap = new HashMap<>();
             List<Object> resultList= FileCopy.getInfoAndUpFile(gbk.listFiles());
             FileUtil.deleteFileAll(temporaryFile);
 //            FileUtil.upFile(file, filePath, fileName);