Merge remote-tracking branch 'moze/master'

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<Map<String, String>> data = excelImporter.readAll().get("工作表1");
+        String sheetname = assertDAO.findDescriptByTable(tablename);
+        System.out.println("sheetname:" + sheetname);
+        System.out.println(excelImporter.readAll());
+        List<Map<String, String>> data = excelImporter.readAll().get(sheetname);
         System.out.println(data);
         data.remove(data.get(0));
+        data.remove(data.get(2));
         List<MappingCol> mappingCols = mappingColDAO.findByTable(tablename);
         inventoryDAO.truncateTable(tablename);
         searchDAO.deleteByTablename(tablename);

src/main/java/com/moze/rms/dao/AssertDAO.java

@@ -26,6 +26,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<Map<String, Object>> findTypesByTable(String tablename) {
 //        List<Map<String, Object>> assertGroup = findAssertGroups();