diff --git a/WebRoot/Excel/3e97aece-bb34-4971-91ca-d869bf0115cc.xlsx b/WebRoot/Excel/3e97aece-bb34-4971-91ca-d869bf0115cc.xlsx new file mode 100644 index 00000000..c7909670 Binary files /dev/null and b/WebRoot/Excel/3e97aece-bb34-4971-91ca-d869bf0115cc.xlsx differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index 03e475eb..abbceb39 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -1607,7 +1607,7 @@ public class CollectController extends Controller { } /** - * 功能:根据任务ID,生成通用的EXCEL导出下载 + * 功能:根据任务ID,生成通用的EXCEL导出下载(支持转发) * * @param job_id */ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index 5b81e522..afb7ddb2 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -1727,8 +1727,16 @@ public class CollectModel { * @return */ public List getTableDataByJobId(int job_id, String table_name) { - String sql = "select * from " + table_name + " where job_id = ?"; - return Db.find(sql, job_id); + String sql = "select job_id from t_collect_job where parent_id=?"; + List list = Db.find(sql, job_id); + String ids = job_id + ","; + for (Record record : list) { + ids += record.getStr("job_id") + ","; + } + if (ids.length() > 0) ids = ids.substring(0, ids.length() - 1); + + sql = "select * from " + table_name + " where job_id in(" + ids + ")"; + return Db.find(sql); } /**