'commit'

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

@@ -713,8 +713,10 @@ public class CollectModel {
         if (finish_flag == 1) return status_code;
         return status_code + 1;
     }
+
     /**
      * 回写完成标记
+     *
      * @param job_id
      * @param bureau_id
      * @param upload_excel_filename_user
@@ -1111,6 +1113,12 @@ public class CollectModel {
         }
         //县区级发布
         else if (publish_job_type_id == 2) {
+            //所有老师
+            if (allTeacher == 1) {
+                for (Record r : getAllTeacher(bureau_id)) {
+                    targetSet.add(r.getStr("person_id"));
+                }
+            }
             if (xiaShuSchool == 1) {
                 //query_type_id=2:查县区属
                 Page<Record> list = getBureauList(2, "2", area_id, null, 1, 9999);
@@ -1184,8 +1192,8 @@ public class CollectModel {
         List<Record> list = new ArrayList<>();
         for (String s : targetSet) {
             //哪种类型的单位要接受这个任务呢？
-            int orgTypeId = getOrgTypeId(s);
+            int orgTypeId = 0;
-
+            if (target_type_id == 1) orgTypeId = getOrgTypeId(s);
             List<Integer> statusCodeList = new ArrayList<>();
             //按发布对象分类
             switch (target_type_id) {
@@ -1227,7 +1235,7 @@ public class CollectModel {
                     }
                     if (publish_job_type_id == 2) {//县区
                         //接收者：县区教育局,县区教辅单位，县区学校
-                        statusCodeList.add(2230);   //人员任务，县发起，需转发本单位，未转发
+                        statusCodeList.add(2310);   //人员任务，县发起，需转发本单位，未转发
                     }
                     if (publish_job_type_id == 3) {//单位
                         statusCodeList.add(2310);  //2:人员任务，3：单位发的，1：填报任务，0：没填写
@@ -2364,7 +2372,8 @@ public class CollectModel {
         Kv kv = Kv.create();
         kv.set("target_id", person_id);
         if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
-        if (is_finish != -1) kv.set("is_finish", is_finish);
+        if (is_finish == 1) kv.set("is_finish1", 1);
+        if (is_finish == 0) kv.set("is_finish0", 1);
 
         SqlPara sqlPara = Db.getSqlPara("Collect.viewJobListPerson", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);

src/main/resource/Sql/Collect.sql

@@ -68,10 +68,14 @@
 
     -- 任务列表 (个人)
     #sql("viewJobListPerson")
-        select t1.*,t2.job_name,t2.publish_time,t2.create_time,t2.job_type from t_collect_job_target as t1 inner join t_collect_job as t2 on t1.job_id=t2.job_id
+        select t1.*,t2.job_name,t2.publish_time,t2.create_time,t2.job_type from t_collect_job_target as t1
+        inner join t_collect_job as t2 on t1.job_id=t2.job_id
         where t1.target_id=#para(target_id)
-        #if(is_finish)
+        #if(is_finish0)
-            and t1.is_finish= #para(is_finish)
+            and t1.status_code in (2210,2310)
+        #end
+        #if(is_finish1)
+            and t1.status_code in (2211,2311)
         #end
         #if(keyword)
            and t2.job_name like #para(keyword, "like")