待审核任务文件去除根据任务状态过滤

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml

@@ -472,7 +472,7 @@
         left join task on tf.task_id = task.id
         left join project p on task.project_id = p.id
         <where>
-            task.task_status = 0 and task.final_charge_status = 0
+            task.final_charge_status = 0
             and case task.charge_stage
             when 1 then (p.incharger_id = task.charge_one_id and task.charge_one_status != 2)
             when 2 then (p.incharger_id = task.charge_two_id and task.charge_two_status != 2)
@@ -512,7 +512,7 @@
         left join user on task.creater_id = user.id
         left join department d on user.department_id = d.department_id
         <where>
-            task.task_status = 0 and task.final_charge_status = 0
+            task.final_charge_status = 0
             and case task.charge_stage
             when 1 then (d.manager_id = task.charge_one_id and task.charge_one_status != 2)
             when 2 then (d.manager_id = task.charge_two_id and task.charge_two_status != 2)
@@ -557,7 +557,7 @@
         left join task on tf.task_id = task.id
         left join project p on task.project_id = p.id
         <where>
-            task.task_status = 0 and task.final_charge_status = 0
+            task.final_charge_status = 0
             and case task.charge_stage
             when 1 then (p.incharger_id = task.charge_one_id and task.charge_one_status != 2)
             when 2 then (p.incharger_id = task.charge_two_id and task.charge_two_status != 2)
@@ -597,7 +597,7 @@
         left join user on task.creater_id = user.id
         left join department d on user.department_id = d.department_id
         <where>
-            task.task_status = 0 and task.final_charge_status = 0
+            task.final_charge_status = 0
             and case task.charge_stage
             when 1 then (d.manager_id = task.charge_one_id and task.charge_one_status != 2)
             when 2 then (d.manager_id = task.charge_two_id and task.charge_two_status != 2)
@@ -656,7 +656,6 @@
         <where>
             tf.need_file_charge = 1
             and tf.final_charge_status = 0
-            and task.task_status = 0
             and task.company_id = #{queryBO.companyId}
             and case tf.charge_stage
             when 1 then tf.charge_one_id = #{queryBO.userId} and tf.charge_one_status = 0
@@ -689,7 +688,6 @@
         <where>
             tf.need_file_charge = 1
             and tf.final_charge_status = 0
-            and task.task_status = 0
             and task.company_id = #{queryBO.companyId}
             and case tf.charge_stage
             when 1 then tf.charge_one_id = #{queryBO.userId} and tf.charge_one_status = 0
@@ -751,7 +749,6 @@
         <where>
             tf.need_file_charge = 1
             and tf.final_charge_status = 0
-            and task.task_status = 0
             and task.company_id = #{queryBO.companyId}
             and case tf.charge_stage
             when 1 then tf.charge_one_id != #{queryBO.userId} and tf.charge_one_status = 0
@@ -784,7 +781,6 @@
         <where>
             tf.need_file_charge = 1
             and tf.final_charge_status = 0
-            and task.task_status = 0
             and task.company_id = #{queryBO.companyId}
             and case tf.charge_stage
             when 1 then tf.charge_one_id != #{queryBO.userId} and tf.charge_one_status = 0