'commit'

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -877,8 +877,12 @@ public class CollectModel {
             if (record.getInt("job_type") == 1) record.set("job_type_name", "表单");
             else if (record.getInt("job_type") == 2) record.set("job_type_name", "EXCEL模板");
 
-            if (record.getInt("publish_state") == 1) record.set("publish_state_name", "已发布");
-            else if (record.getInt("publish_state") == 0) {
+            if (record.getInt("publish_state") == 1) {
+                int finish_count = record.getInt("finish_count");
+                int total_count = record.getInt("total_count");
+                record.set("fill_progress", finish_count + "/" + total_count);
+                record.set("publish_state_name", "已发布");
+            } else if (record.getInt("publish_state") == 0) {
                 record.set("publish_state_name", "待发布");
                 record.set("fill_progress", "-");
             }

src/main/resource/Sql/collect.sql

@@ -1,11 +1,14 @@
 #namespace("Collect")
     -- 获取任务列表
     #sql("getJobList")
-        select * from t_collect_job where 1=1
+        select t1.*,
+        (select count(1) from t_collect_job_bureau as t2 where t2.job_id=t1.job_id and t2.is_finish=1) as finish_count,
+        (select count(1) from t_collect_job_bureau as t2 where t2.job_id=t1.job_id ) as total_count
+        from t_collect_job as t1 where 1=1
         #if(job_name)
-            and job_name like #para(job_name, "like")
+            and t1.job_name like #para(job_name, "like")
         #end
-        order by job_id desc
+        order by t1.job_id desc
     #end
     -- 获取学校类型
     #sql("getSchoolType")