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

Doc/数据上报系统测试账号.txt

@@ -41,7 +41,6 @@ t_importexcel_role_map
 （1）发的角色可以是多个，收的角色只能是一个
 （2）如果某人有多个发的角色，那么取第一个，如果以后反馈不方便，就修改为发现某人有多个发的角色，那么让他选择一个。
 
-# 清库脚本
 truncate table t_collect_job restart identity;
 truncate table t_collect_job_sheet  restart identity;
 truncate table t_collect_job_sheet_col  restart identity;

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

@@ -435,21 +435,21 @@ public class CollectController extends Controller {
             renderJson(map);
             return;
         }
-        int publish_state = record.getInt("publish_state");
-        if (publish_state == 1) {
-            int is_finish_count = 0;
-            List<Record> list = cm.getJobFill(job_id);
-            for (Record r : list) {
-                if (r.getInt("is_finish") == 1) is_finish_count++;
-            }
-            if (is_finish_count > 0) {
-                Map<String, Object> map = new HashMap<>();
-                map.put("success", false);
-                map.put("message", "任务已发布，并且存在填报记录，无法删除!");
-                renderJson(map);
-                return;
-            }
-        }
+//        int publish_state = record.getInt("publish_state");
+//        if (publish_state == 1) {
+//            int is_finish_count = 0;
+//            List<Record> list = cm.getJobFill(job_id);
+//            for (Record r : list) {
+//                if (r.getInt("is_finish") == 1) is_finish_count++;
+//            }
+//            if (is_finish_count > 0) {
+//                Map<String, Object> map = new HashMap<>();
+//                map.put("success", false);
+//                map.put("message", "任务已发布，并且存在填报记录，无法删除!");
+//                renderJson(map);
+//                return;
+//            }
+//        }
         cm.delJob(job_id);
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);

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

@@ -868,6 +868,23 @@ public class CollectModel {
     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 form_table_name = Db.findFirst(sql, job_id).getStr("form_table_name");
+        if (!StrKit.isBlank(form_table_name)) dropTable(form_table_name);
+
+        sql = "select table_name  from t_collect_job_sheet where job_id=?";
+        List<Record> list = Db.find(sql, job_id);
+        for (Record record : list) {
+            String table_name = record.getStr("table_name");
+            sql = "select count(1) as c from t_collect_job_sheet where job_id<>? and table_name=?";
+            int c = Db.findFirst(sql, job_id, table_name).getInt("c");
+            if (c == 0) dropTable(table_name);
+        }
+
         sql = "delete from t_collect_job_bureau where job_id=?";
         Db.update(sql, job_id);