From ed8d2b7288e6e0fa5f9c0743164987fb3ca37d12 Mon Sep 17 00:00:00 2001 From: han0 Date: Tue, 10 Dec 2024 17:35:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=89=E6=98=8E?= =?UTF-8?q?=E9=92=A2=E9=93=81=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java | 2 ++ src/test/java/mjkf/xinke/UploadFileTest.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java index d8ada1b..a229be8 100644 --- a/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java +++ b/src/main/java/mjkf/xinke/main/model/db/SanmingSteel.java @@ -67,7 +67,9 @@ public class SanmingSteel extends Model { public SanmingSteel (Row row, MaterialTask task) { var policy = Row.MissingCellPolicy.CREATE_NULL_AS_BLANK; + row.getCell(0).setCellType(CellType.STRING); row.getCell(1).setCellType(CellType.STRING); + row.getCell(2).setCellType(CellType.STRING); this.setName(row.getCell(1, policy).getStringCellValue()); this.setSpec(row.getCell(2, policy).getStringCellValue()); this.setMaterial(row.getCell(0, policy).getStringCellValue()); diff --git a/src/test/java/mjkf/xinke/UploadFileTest.java b/src/test/java/mjkf/xinke/UploadFileTest.java index dd1218e..a1448fc 100644 --- a/src/test/java/mjkf/xinke/UploadFileTest.java +++ b/src/test/java/mjkf/xinke/UploadFileTest.java @@ -1,5 +1,6 @@ package mjkf.xinke; +import cn.hutool.core.io.FileUtil; import mjkf.xinke.dev.modular.file.enums.DevFileEngineTypeEnum; import mjkf.xinke.dev.modular.file.service.DevFileService; import org.junit.Test; @@ -26,7 +27,8 @@ public class UploadFileTest { @Test public void test() throws Exception { // var filePath = "C:\\Users\\Administrator\\Desktop\\材料管理系统模版\\历史数据\\地材-202405.xlsx"; - var filePath = "C:\\Users\\Administrator\\Documents\\工作表 在 9月完成功能.xlsx"; +// var filePath = "C:\\Users\\Administrator\\Documents\\工作表 在 9月完成功能.xlsx"; + var filePath = "C:\\Users\\Administrator\\Documents\\三明钢铁.xlsx"; var file = new File(filePath); // var multipartFile = this.mockMultipartFile(file, "相邻城市价格.xlsx", "application/x-zip-compressed"); var multipartFile = this.mockMultipartFile(file); @@ -42,6 +44,7 @@ public class UploadFileTest { * 1810497092512178177 地材.xlsx 1101 * 1810506191866003457 地材-202405.xlsx 1101 * 1838851336371163138 相邻城市.xlsx 600 + * 1866412571689631746 三明钢铁.xlsx 301 */ private MultipartFile mockMultipartFile(File file) throws IOException {