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

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;
         }
         //提供下载

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");//表格名称