'commit'

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -24,6 +24,7 @@ import org.apache.poi.xssf.usermodel.*;
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.sql.SQLOutput;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -876,7 +877,7 @@ public class CollectModel {
         String sql = "select form_table_name from t_collect_job where job_id=?";
         String form_table_name = Db.findFirst(sql, job_id).getStr("form_table_name");
         if (!StrKit.isBlank(form_table_name)) {
-            sql = "select count(1) as c  from t_collect_job_sheet where form_table_name=? and job_id<>?";
+            sql = "select count(1) as c  from t_collect_job where form_table_name=? and job_id<>?";
             int c = Db.findFirst(sql, form_table_name, job_id).getInt("c");
             if (c == 0) dropTable(form_table_name);
         }
@@ -1038,12 +1039,15 @@ public class CollectModel {
         String colSql = "", commentSql = "";
         for (Object o : ja) {
             JSONObject jo = (JSONObject) o;
+            if (jo.get("fieldType") != null) jo.put("data_type_id", jo.getIntValue("fieldType"));
+            jo.remove("fieldType");
+            if (jo.get("data_type_id") == null) jo.put("data_type_id", 1);
             boolean required = jo.getBoolean("required");//必填
             String original_name = jo.getString("label");//描述
             String column_name = jo.getString("id");//字段名
             int data_type_id = jo.getInteger("data_type_id");// 数据类型
             String column_type = getDataType(data_type_id, DataTypeConst.PG_DATA_TYPE);
-            colSql += column_name + " " + column_type;
+            colSql +="\""+ column_name + "\" " + column_type;
 
             if (required) colSql += " NOT NULL ";
             colSql += ",";
@@ -1055,7 +1059,7 @@ public class CollectModel {
         finalSql += "\"bureau_id\" char(36) NOT NULL,";
         finalSql += "\"person_id\" char(36)  NOT NULL,";
         finalSql += "\"class_id\" char(36) ,";
-        finalSql += "\"job_id\" int(4)  NOT NULL,";
+        finalSql += "\"job_id\" int4  NOT NULL,";
         finalSql += colSql;
         finalSql += "PRIMARY KEY (\"id\")";
         finalSql += ");\n";