'commit'

src/main/java/UnitTest/ImportExcel/CreateTableAndTemplate.java

@@ -38,16 +38,20 @@ public class CreateTableAndTemplate {
      * @return
      */
     public static void changeData(List<Kv> toDoKvList) {
-        int cnt = 0;
+        int sheetIdx = 0;
         for (Kv kv : toDoKvList) {
             List<Record> _list = (List<Record>) kv.get("list");
+            int colIdx = 0;
             for (Record record : _list) {
                 record.set("column_type", "varchar(2048)");
                 record.set("allow_blank", false);
-                record.set("options", "男,女,未知");//生成下拉框
+                if (sheetIdx == 0 && colIdx == 3) {//第一个Sheet表的品牌型号列
+                    record.set("options", "华为,中兴,思科");//生成下拉框
+                }
+                colIdx++;
             }
-            cnt++;
-            kv.set("table_name", "ds_source_" + cnt);
+            sheetIdx++;
+            kv.set("table_name", "ds_source_" + sheetIdx);
         }
     }
 

src/main/java/com/dsideal/QingLong/Util/ImportUtil.java

@@ -264,7 +264,7 @@ public class ImportUtil {
         String sheetName = input.getStr("sheet_name");
         String colSql = "", commentSql = "";
         for (Record record : list) {
-            String column_name = record.getStr("column_name");
+            String column_name = record.getStr("column_name").toLowerCase();
             colSql += column_name + " " + record.getStr("column_type");//varchar(2048)
             String memo = record.getStr("memo");
             if (record.getBoolean("allow_blank") == null || !record.getBoolean("allow_blank")) colSql += " NOT NULL ";