From eeb7f3a7443aa142a6634d1f745ec7f2fe1c1a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 12 Jan 2024 14:16:54 +0800 Subject: [PATCH] 'commit' --- .../ec318b3f-2f5d-4d30-86b1-1264832df2d1.xlsx | Bin 0 -> 9798 bytes .../QingLong/Collect/Model/CollectModel.java | 28 ++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 WebRoot/Excel/ec318b3f-2f5d-4d30-86b1-1264832df2d1.xlsx diff --git a/WebRoot/Excel/ec318b3f-2f5d-4d30-86b1-1264832df2d1.xlsx b/WebRoot/Excel/ec318b3f-2f5d-4d30-86b1-1264832df2d1.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..e042e42db0665edf01ea935a5665794d3b422037 GIT binary patch literal 9798 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 getTableDataByJobId(int job_id, String table_name) { - String sql = "select job_id from t_collect_job where parent_id=?"; - List list = Db.find(sql, job_id); + List jobList = new ArrayList<>(); + dfsJob(job_id, jobList); + String ids = job_id + ","; - for (Record record : list) { - ids += record.getStr("job_id") + ","; + for (Integer x : jobList) { + ids += x + ","; } if (ids.length() > 0) ids = ids.substring(0, ids.length() - 1); - - sql = "select * from " + table_name + " where job_id in(" + ids + ")"; + String sql = "select * from " + table_name + " where job_id in(" + ids + ")"; return Db.find(sql); } + /** + * 功能:递归获取所有任务树的任务IDS + * + * @param job_id + * @param jobList + */ + public void dfsJob(int job_id, List jobList) { + String sql = "select job_id from t_collect_job where parent_id=?"; + List list = Db.find(sql, job_id); + jobList.add(job_id); + for (Record record : list) { + jobList.add(record.getInt("job_id")); + dfsJob(record.getInt("job_id"), jobList); + } + } + /** * 功能:获取指定列的列描述信息 *