'commit'

WebRoot/view/tb/org/task_list.html

@@ -143,7 +143,7 @@
                         { title: '发布时间', field: 'publish_time', align: 'center', width: "10%" },
                         { title: '截止时间', field: 'deadline_time', align: 'center', width: "10%" },
                         { title: '填报格式', field: 'job_type_name', align: 'center', width: "10%" },
-                        // { title: '填报进度', align: 'center', width: "10%", templet: '#progress-Templet' },
+                         { title: '填报进度', align: 'center', width: "10%", templet: '#progress-Templet' },
                         {
                             title: '填报进度', align: 'center', width: "10%", templet: function () {
                                 var html = '<div class="layui-progress layui-progress-big" lay-showPercent="true" lay-filter="rate">';

WebRoot/view/tb/org/task_view.html

@@ -115,7 +115,10 @@
                         { title: '序号', align: 'center', width: "5%", type: 'numbers' },
                         { title: '单位名称', field: 'bureau_name', align: 'center' },
                         { title: '填报状态', align: 'center', width: "10%", templet: '#status-Templet' },
-                        { title: '填报时间', field: 'fill_time', align: 'center', width: "20%" },
+                        { title: '填报时间', field: 'fill_time', align: 'center', width: "15%" },
+                        { title: '联系人', field: 'person_name', align: 'center', width: "15%" },
+                        { title: '电话', field: 'telephone', align: 'center', width: "15%" },
+                        { title: '邮件', field: 'email', align: 'center', width: "10%" },
                         { title: '操作', align: 'center', width: "20%", toolbar: '#table-bar' }
                     ]],
                     skin: 'line',

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

@@ -959,6 +959,12 @@ public class CollectModel {
         if (is_finish != -1) kv.set("is_finish", is_finish);
         SqlPara sqlPara = Db.getSqlPara("Collect.listFilledJob", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
+        for (Record record : pageRecord.getList()) {
+            if (record.getStr("telephone") == null || record.getStr("telephone").trim().equals("-1"))
+                record.set("telephone", "-");
+            if (record.getStr("email") == null || record.getStr("email").trim().equals("-1"))
+                record.set("email", "-");
+        }
         return pageRecord;
     }
 

src/main/resource/Sql/collect.sql

@@ -48,8 +48,13 @@
     #end
     -- 任务发布者，查看发布的任务填充情况
     #sql("listFilledJob")
-        select t1.*,t2.org_name as bureau_name from t_collect_job_bureau as t1
+        select t1.*,t2.org_name as bureau_name,
+        t3.person_name as person_name,
+        t3.telephone as telephone,
+        t3.email as email
+        from t_collect_job_bureau as t1
         inner join t_base_organization as t2 on t1.bureau_id=t2.org_id
+        inner join v_collect_xbgs as t3 on t1.bureau_id=t3.bureau_id
         where t1.job_id=#para(job_id)
         #if(is_finish)
           and t1.is_finish=#para(is_finish)