Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

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

@@ -866,15 +866,16 @@ public class CollectModel {
      * @param job_id
      */
     public void delJob(int job_id) {
-        String sql = "delete from t_collect_job where job_id=?";
-        Db.update(sql, job_id);
-
         /*
          * 检查此任务是否关联的表，只被它一个人使用，如果是，就删除相关表
          */
-        sql = "select form_table_name from t_collect_job where job_id=?";
+        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)) dropTable(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<>?";
+            int c = Db.findFirst(sql, form_table_name, job_id).getInt("c");
+            if (c == 0) dropTable(form_table_name);
+        }
 
         sql = "select table_name  from t_collect_job_sheet where job_id=?";
         List<Record> list = Db.find(sql, job_id);
@@ -885,6 +886,9 @@ public class CollectModel {
             if (c == 0) dropTable(table_name);
         }
 
+        sql = "delete from t_collect_job where job_id=?";
+        Db.update(sql, job_id);
+
         sql = "delete from t_collect_job_bureau where job_id=?";
         Db.update(sql, job_id);
 
@@ -1046,6 +1050,7 @@ public class CollectModel {
         finalSql += "\"id\" serial4,";
         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 += colSql;
         finalSql += "PRIMARY KEY (\"id\")";
@@ -1054,6 +1059,7 @@ public class CollectModel {
         finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"id\" IS '主键，自增长ID';\n";
         finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"bureau_id\" IS '单位ID';\n";
         finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"person_id\" IS '上传人员ID';\n";
+        finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"class_id\" IS '班级ID';\n";
         finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"job_id\" IS '任务ID';\n";
         finalSql += commentSql;
         finalSql += "COMMENT ON TABLE \"public\".\"" + table_name + "\" IS '" + job_name + "';";