From 6df081af3f9363b7dbdc525339ad13db84432967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 27 Dec 2023 11:55:17 +0800
Subject: [PATCH] 'commit'

---
 .../b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf  | Bin 54324 -> 54324 bytes
 src/main/resource/Sql/collect.sql             |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf b/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf
index 1d88d45d27684ef60acda9e88fa70c7d69feb6c1..d1678c786ff1240669b164a574102714748e7ca1 100644
GIT binary patch
delta 97
zcmdn8f_cjd<_)j(m`x2$Cco8_0@0hf^iM8vGI6tTaxyS+GITYtFf%qYHFGv|Ha9jh
zx3F|EHZ*s#u(L5XbT+bZbG39ebu>3~G;y&oG%<2?bu)Lgv@~;Za(108dPN=pkVP8R

delta 97
zcmdn8f_cjd<_)j(n2pViC%@H`0@0hf^iM8vGBYqWG%|B>GcYhVGcz_bHFGv|HaB*2
zbuu%ybTV@`wX?A>b~Z3}GPbaEbu@A`HF30bGjcUHGPQ7VGPZOxa5I}MdPN=piH;hZ

diff --git a/src/main/resource/Sql/collect.sql b/src/main/resource/Sql/collect.sql
index e2eca4b3..aa4b73fb 100644
--- a/src/main/resource/Sql/collect.sql
+++ b/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)