diff --git a/WebRoot/Excel/a6fc4858-42c9-4b68-af6a-3c7f44e013ea.xlsx b/WebRoot/Excel/a6fc4858-42c9-4b68-af6a-3c7f44e013ea.xlsx new file mode 100644 index 00000000..c7137c87 Binary files /dev/null and b/WebRoot/Excel/a6fc4858-42c9-4b68-af6a-3c7f44e013ea.xlsx differ diff --git a/WebRoot/Excel/adf7e99f-ee52-4e5b-bee1-7696170b2628.xlsx b/WebRoot/Excel/adf7e99f-ee52-4e5b-bee1-7696170b2628.xlsx new file mode 100644 index 00000000..3afe53cd Binary files /dev/null and b/WebRoot/Excel/adf7e99f-ee52-4e5b-bee1-7696170b2628.xlsx differ diff --git a/WebRoot/view/tb/school/report_excel.html b/WebRoot/view/tb/school/report_excel.html index b04a58cf..21aa78ba 100644 --- a/WebRoot/view/tb/school/report_excel.html +++ b/WebRoot/view/tb/school/report_excel.html @@ -34,13 +34,10 @@ var jobId = GetQueryString("job_id"); var downExcelPath = GetQueryString("file_name"); - var statusCode = GetQueryString("status_code"); - - $("#downExcel").click(function () { - window.location = "/QingLong/Excel/" + downExcelPath; + window.location = "/QingLong/collect/downJobExcelTemplate?job_id=" + jobId; }); upload.render({ 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 ec363849..467df750 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -1688,6 +1688,23 @@ public class CollectController extends Controller { renderFile(new File(excelPath), "【" + job_name + "】汇总表.xlsx"); } + /** + * 功能:下载指定任务的EXCEL模板 + * + * @param job_id + */ + @Before({GET.class}) + @IsLoginInterface({}) + @IsNumericInterface({"job_id"}) + public void downJobExcelTemplate(int job_id) { + Record jobRecord = cm.getJob(job_id); + String job_name = jobRecord.getStr("job_name"); + String tmpFile = jobRecord.getStr("upload_excel_filename"); + String excelPath = basePath + "/" + tmpFile; + //提供下载 + renderFile(new File(excelPath), job_name + ".xlsx"); + } + /** * 功能:获取当前人员的发布角色 */ diff --git a/src/main/resource/Excel/极简模板.xlsx b/src/main/resource/Excel/极简模板.xlsx new file mode 100644 index 00000000..c7137c87 Binary files /dev/null and b/src/main/resource/Excel/极简模板.xlsx differ