diff --git a/WebRoot/Excel/1b466e25-e30c-447d-b456-c6c265dc1053.xlsx b/WebRoot/Excel/1b466e25-e30c-447d-b456-c6c265dc1053.xlsx new file mode 100644 index 00000000..3f104cb8 Binary files /dev/null and b/WebRoot/Excel/1b466e25-e30c-447d-b456-c6c265dc1053.xlsx differ diff --git a/WebRoot/Excel/22087e32-6ec7-4468-804a-f8f622986cdf.xlsx b/WebRoot/Excel/22087e32-6ec7-4468-804a-f8f622986cdf.xlsx new file mode 100644 index 00000000..3ee71708 Binary files /dev/null and b/WebRoot/Excel/22087e32-6ec7-4468-804a-f8f622986cdf.xlsx differ diff --git a/WebRoot/Excel/46bf63fe-fcec-490f-88ac-35b1492f479b.xlsx b/WebRoot/Excel/46bf63fe-fcec-490f-88ac-35b1492f479b.xlsx new file mode 100644 index 00000000..9465c4ec Binary files /dev/null and b/WebRoot/Excel/46bf63fe-fcec-490f-88ac-35b1492f479b.xlsx differ diff --git a/WebRoot/Excel/82314cc7-f10d-42a6-827d-aa05fad4771a.xlsx b/WebRoot/Excel/82314cc7-f10d-42a6-827d-aa05fad4771a.xlsx new file mode 100644 index 00000000..b0150df1 Binary files /dev/null and b/WebRoot/Excel/82314cc7-f10d-42a6-827d-aa05fad4771a.xlsx differ diff --git a/WebRoot/Excel/aab44196-feee-4412-8c3a-cb0ca47abf68.xlsx b/WebRoot/Excel/aab44196-feee-4412-8c3a-cb0ca47abf68.xlsx new file mode 100644 index 00000000..1e89f77d Binary files /dev/null and b/WebRoot/Excel/aab44196-feee-4412-8c3a-cb0ca47abf68.xlsx differ diff --git a/WebRoot/Excel/d19bf2a7-3ca5-40bc-be27-8f770537f563.xlsx b/WebRoot/Excel/d19bf2a7-3ca5-40bc-be27-8f770537f563.xlsx new file mode 100644 index 00000000..cba89236 Binary files /dev/null and b/WebRoot/Excel/d19bf2a7-3ca5-40bc-be27-8f770537f563.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 1e7219a4..50db9f37 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -1650,10 +1650,10 @@ public class CollectController extends Controller { int job_type = jobRecord.getInt("job_type");//任务类型:1:表单,2:EXCEL模板 switch (job_type) { case 1: - cm.getSummaryExcelForFormFill(job_id,publish_role_id, excelPath); //测试用例 job_id=8 + cm.getSummaryExcelForFormFill(job_id,bureau_id,publish_role_id, excelPath); //测试用例 job_id=8 break; case 2: - cm.getSummaryExcelForImportExcel(job_id,publish_role_id, excelPath);//测试用例 job_id=47 + cm.getSummaryExcelForImportExcel(job_id,bureau_id,publish_role_id, excelPath);//测试用例 job_id=47 break; } //提供下载 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 d561665a..e2262f9d 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -2124,9 +2124,7 @@ public class CollectModel { * @param filePath * @throws IOException */ - public void getSummaryExcelForImportExcel(int job_id, int publish_role_id, String filePath) throws IOException { //给定任务编号,获取它有哪些表 - Record jobRecord = getJob(job_id); - String bureau_id = jobRecord.getStr("bureau_id"); + public void getSummaryExcelForImportExcel(int job_id, String bureau_id, int publish_role_id, String filePath) throws IOException { //给定任务编号,获取它有哪些表 //下辖单位有哪些 String controlBureauIds = getControlBureauIds(publish_role_id, bureau_id); // 创建工作簿和工作表 @@ -2283,7 +2281,7 @@ public class CollectModel { //拼接出单位ids String bureauIds = ""; for (String s : idList) { - bureauIds += "'"+s + "',"; + bureauIds += "'" + s + "',"; } if (bureauIds.length() > 0) bureauIds = bureauIds.substring(0, bureauIds.length() - 1); return bureauIds; @@ -2296,9 +2294,8 @@ public class CollectModel { * @param filePath * @throws IOException */ - public void getSummaryExcelForFormFill(int job_id, int publish_role_id, String filePath) throws IOException { + public void getSummaryExcelForFormFill(int job_id, String bureau_id, int publish_role_id, String filePath) throws IOException { Record jobRecord = getJob(job_id); - String bureau_id = jobRecord.getStr("bureau_id"); //下辖单位有哪些 String controlBureauIds = getControlBureauIds(publish_role_id, bureau_id); String table_name = jobRecord.getStr("form_table_name");//表格名称