'commit'

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -243,6 +243,13 @@ public class CollectController extends Controller {
             renderJson(kvCheck);
             return;
         }
+        //检查所有表是不是全部is_check=1
+        Kv kvAllCheck = cm.checkAllSheetIsCheck(job_id);
+        if (!kvAllCheck.getBoolean("success")) {
+            renderJson(kvAllCheck);
+            return;
+        }
+
         //保存任务名称
         cm.saveJob(job_id, job_name);
 
@@ -251,11 +258,18 @@ public class CollectController extends Controller {
         for (Record record : listJobSheet) {
             String tableName = record.getStr("table_name");
             if (ImportExcelKit.isTableExist(tableName)) {
-                System.out.println("表" + tableName + "已存在，不能删除，程序无法继续！");
-                //Kv kv
+                Kv kv = Kv.create();
+                kv.set("success", false);
+                kv.set("message", "表" + tableName + "已存在，不能删除，程序无法继续！");
+                renderJson(kv);
                 return;
             }
         }
+        //检查通过，处理建表逻辑
+        for (Record record : listJobSheet) {
+            //String tableName = record.getStr("table_name");
+            //ImportExcelKit.createTable(tableName, kv);//创建表
+        }
 
         //返回成功
         Map map = new HashMap();

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

@@ -219,4 +219,23 @@ public class CollectModel {
         String sql = "select * from t_collect_job_sheet where job_id=?";
         return Db.find(sql, job_id);
     }
+
+    /**
+     * 功能：是不是指定任务的所有Sheet全部都确认通过
+     *
+     * @param job_id
+     * @return
+     */
+    public Kv checkAllSheetIsCheck(int job_id) {
+        Kv kv = Kv.create();
+        String sql = "select count(1) as c from t_collect_job_sheet where job_id=? and is_check=0";
+        int c = Db.findFirst(sql, job_id).getInt("c");
+        if (c > 0) {
+            kv.set("success", false);
+            kv.set("message", "存在" + c + "个未确认的Sheet，不能保存任务！");
+            return kv;
+        }
+        kv.set("success", true);
+        return kv;
+    }
 }