Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

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

@@ -855,9 +855,10 @@ public class CollectController extends Controller {
     @IsLoginInterface({})
     @IsNumericInterface({"job_id", "is_finish"})
     @LayUiPageInfoInterface({"page", "limit"})
-    public void viewJob(int job_id, String keyword, int is_finish, int page, int limit, int fill_type_id) {
+    public void viewJob(int job_id, String keyword, int is_finish, int forward_is_finish, int page, int limit, int fill_type_id) {
         if (fill_type_id == 0) fill_type_id = 1;//填报任务类型：1：填报，2：转发，3：填报+转发
-        Page<Record> list = cm.viewJob(job_id, keyword, is_finish, page, limit, fill_type_id);
+        //forward_is_finish:1=转发已反馈 0：转发未反馈
+        Page<Record> list = cm.viewJob(job_id, keyword, is_finish,forward_is_finish, page, limit, fill_type_id);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 

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

@@ -1096,7 +1096,7 @@ public class CollectModel {
      * @param page
      * @param limit
      */
-    public Page<Record> viewJob(int job_id, String keyword, int is_finish, int page, int limit, int fill_type_id) {
+    public Page<Record> viewJob(int job_id, String keyword, int is_finish, int forward_is_finish, int page, int limit, int fill_type_id) {
         if (fill_type_id == 0) fill_type_id = 1;//填报任务类型：1：填报，2：转发，3：填报+转发
         Kv kv = Kv.create();
         kv.set("job_id", job_id);
@@ -1107,6 +1107,10 @@ public class CollectModel {
         else if (fill_type_id == 2) kv.set("fill_type_id_2", 1);
         else if (fill_type_id == 3) kv.set("fill_type_id_3", 1);
 
+        //forward_is_finish:1=转发已反馈 0：转发未反馈
+        if (forward_is_finish == 0) kv.set("forward_is_finish_0", 1);
+        else if (forward_is_finish == 1) kv.set("forward_is_finish_1", 1);
+
         SqlPara sqlPara = Db.getSqlPara("Collect.viewJob", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         for (Record record : pageRecord.getList()) {
@@ -1601,9 +1605,9 @@ public class CollectModel {
      *
      * @param job_id 任务ID
      */
-    public void setForwardFinish(int job_id,String bureau_id) {
+    public void setForwardFinish(int job_id, String bureau_id) {
         String sql = "update t_collect_job_target set forward_progress=2,forward_finish_time=now() where job_id=? and target_id=?";
-        Db.update(sql, job_id,bureau_id);
+        Db.update(sql, job_id, bureau_id);
     }
 
     /**
@@ -1616,6 +1620,6 @@ public class CollectModel {
         String sql = "select * from t_collect_job where parent_id=? and bureau_id=?";
         Record record = Db.findFirst(sql, job_id, bureau_id);
         int child_job_id = record.getInt("job_id");
-        return viewJob(child_job_id, null, -1, page, limit, 1);
+        return viewJob(child_job_id, null, -1, 0,page, limit, 1);
     }
 }

src/main/resource/Sql/Collect.sql

@@ -90,6 +90,7 @@
         t3.person_name as person_name,
         t3.telephone as telephone,
         t3.email as email,
+        t4.job_type,
         (select count(1) from t_collect_job_target as t2 where t2.parent_id=t1.job_id and t2.bureau_id=t1.target_id)
         as forward_count,     -- 县区教育局转发给了多少个单位
         (select count(1) from t_collect_job_target as t2 where t2.parent_id=t1.job_id and t2.bureau_id=t1.target_id and t2.is_finish=1)
@@ -100,6 +101,7 @@
         from t_collect_job_target as t1
         inner join t_base_organization as t2 on t1.target_id=t2.org_id
         left join v_collect_xbgs as t3 on t1.target_id=t3.bureau_id
+        inner join t_collect_job as t4 on t1.job_id=t4.job_id
         where t1.job_id=#para(job_id)
         #if(is_finish)
           and t1.is_finish=#para(is_finish)
@@ -113,6 +115,12 @@
         #if(fill_type_id_3)
           and t1.fill_type_id in (3)
         #end
+        #if(forward_is_finish_0)
+         and t1.forward_progress in (0,1)
+        #end
+        #if(forward_is_finish_1)
+         and t1.forward_progress in (2)
+        #end
         #if(keyword)
          and t2.org_name like #para(keyword, "like")
         #end