From 1149c88dafdadb8be8deacef3a330406bbb7db50 Mon Sep 17 00:00:00 2001 From: teddy_msi Date: Thu, 13 May 2021 11:12:28 +0800 Subject: [PATCH] 202105131112 --- src/main/java/com/moze/rms/controller/InventoryController.java | 7 +++++-- src/main/java/com/moze/rms/dao/AssertDAO.java | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/moze/rms/controller/InventoryController.java b/src/main/java/com/moze/rms/controller/InventoryController.java index 98a6a26..ad9545c 100644 --- a/src/main/java/com/moze/rms/controller/InventoryController.java +++ b/src/main/java/com/moze/rms/controller/InventoryController.java @@ -111,10 +111,13 @@ public class InventoryController { file.transferTo(f); ExcelImporter excelImporter = new ExcelImporter(f); - - List> data = excelImporter.readAll().get("工作表1"); + String sheetname = assertDAO.findDescriptByTable(tablename); + System.out.println("sheetname:" + sheetname); + System.out.println(excelImporter.readAll()); + List> data = excelImporter.readAll().get(sheetname); System.out.println(data); data.remove(data.get(0)); + data.remove(data.get(2)); List mappingCols = mappingColDAO.findByTable(tablename); inventoryDAO.truncateTable(tablename); searchDAO.deleteByTablename(tablename); diff --git a/src/main/java/com/moze/rms/dao/AssertDAO.java b/src/main/java/com/moze/rms/dao/AssertDAO.java index 4253165..72e155c 100644 --- a/src/main/java/com/moze/rms/dao/AssertDAO.java +++ b/src/main/java/com/moze/rms/dao/AssertDAO.java @@ -25,6 +25,12 @@ public interface AssertDAO extends SqlObject { return handle.createQuery(sql).mapToMap().list(); } + default String findDescriptByTable(String tablename) { + Handle handle = this.getHandle(); + String sql = "select descript from mapping.mapping_table where tablename = '" + tablename + "'"; + return handle.createQuery(sql).mapTo(String.class).one(); + } + default List> findTypesByTable(String tablename) { // List> assertGroup = findAssertGroups();