'commit'

WebRoot/view/tb/school/task_list.html

@@ -102,14 +102,7 @@
                         { title: '操作', align: 'center', width: "15%", toolbar: '#table-bar' }
                     ]],
                     skin: 'line',
-                    defaultToolbar: [],
-                    parseData: function (res) {
-                        var data = res.data;
-                        for (var i = 0; i < data.length; i++) {
-                            res.data[i].is_finish = isFinish;
-                        }
-                        return res;
-                    }
+                    defaultToolbar: []
                 });
             }
 

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

@@ -815,6 +815,13 @@ public class CollectController extends Controller {
             return;
         }
         String excelPath = basePath + File.separator + upload_excel_filename_user;
+
+        if (!FileUtil.exist(excelPath)) {
+            Kv kv = Kv.by("success", false);
+            kv.set("message", "文件没有找到，请联系管理员处理异常！");
+            renderJson(kv);
+            return;
+        }
         //2、提供EXCEL
         if (type_id == 1) {
             renderFile(new File(excelPath), excel_filename);

src/main/resource/Sql/collect.sql

@@ -36,7 +36,7 @@
     #end
     -- 任务列表
     #sql("viewJobList")
-        select t1.* from t_collect_job as t1 inner join t_collect_job_bureau as t2 on t1.job_id=t2.job_id
+        select t1.*,t2.is_finish from t_collect_job as t1 inner join t_collect_job_bureau as t2 on t1.job_id=t2.job_id
         where t2.bureau_id = #para(bureau_id)
         #if(is_finish)
          and t2.is_finish= #para(is_finish)