'commit'

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -508,6 +508,7 @@ public class CollectController extends Controller {
                 Kv kv = Kv.create();
                 kv.set("success", false);
                 kv.set("message", "第" + (i + 1) + "个Sheet表检查过程中发现与要求上传的模板不一致，请重新下载模板填写完成后再次上传！");
+                kv.set("upload_excel_filename_user", upload_excel_filename_user);
                 renderJson(kv);
                 return;
             }
@@ -614,7 +615,6 @@ public class CollectController extends Controller {
             return;
         }
 
-
         if (!flag) {
             Kv kv = Kv.create();
             kv.set("success", false);
@@ -800,7 +800,6 @@ public class CollectController extends Controller {
 
         //文件名称
         String excel_filename = job_name + "【" + bureau_name + "】.xlsx";
-        String pdf_filename = job_name + "【" + bureau_name + "】.pdf";
 
         //1、找到upload_excel_filename_user
         Record record = cm.viewFilledJob(job_id, bureau_id);