修改任务文件相关接口

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -1365,6 +1365,7 @@ public class TaskController {
                 }
                 if(1 == task.getFinalChargeStatus()){
                     task.setFinalChargeStatusText("审核通过");
+                    task.setFileChargeStatus(1);
                 } else if (0 == task.getFinalChargeStatus()) {
                     String name = "";
                     String statusText = "";
@@ -1373,9 +1374,9 @@ public class TaskController {
                     name = userIdNameMap.getOrDefault(tmpUserId,"");
                     switch (finalStatus)
                     {
-                        case 0:  statusText = "待审核";break;
+                        case 0:  statusText = "待审核"; task.setFileChargeStatus(0);break;
                         case 1:  statusText = "通过";break;
-                        case 2:  statusText = "驳回";break;
+                        case 2:  statusText = "驳回"; task.setFileChargeStatus(2);break;
                     }
                     task.setFinalChargeStatusText(statusText+"("+name+")");
                 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Task.java

@@ -295,6 +295,9 @@ public class Task extends Model<Task> {
 
     @TableField(exist = false)
     private String finalChargeStatusText;
+    @TableField(exist = false)
+    /**0 待审核 1通过 2驳回*/
+    private int fileChargeStatus;
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -427,8 +427,8 @@
                 <where>
                     task.task_status = 0 and task.final_charge_status = 0
                     and case task.charge_stage
-                    when 1 then p.incharger_id = task.charge_one_id
-                    when 2 then p.incharger_id = task.charge_two_id
+                    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)
                     end
                     <if test="queryBO.projectId != null">
                         and tf.project_id = #{queryBO.projectId}
@@ -467,8 +467,8 @@
                 <where>
                     task.task_status = 0 and task.final_charge_status = 0
                     and case task.charge_stage
-                    when 1 then d.manager_id = task.charge_one_id
-                    when 2 then d.manager_id = task.charge_two_id
+                    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)
                     end
                     <if test="queryBO.projectId != null">
                         and tf.project_id = #{queryBO.projectId}
@@ -512,8 +512,8 @@
         <where>
             task.task_status = 0 and task.final_charge_status = 0
             and case task.charge_stage
-            when 1 then p.incharger_id = task.charge_one_id
-            when 2 then p.incharger_id = task.charge_two_id
+            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)
             end
             <if test="queryBO.projectId != null">
                 and tf.project_id = #{queryBO.projectId}
@@ -552,8 +552,8 @@
         <where>
             task.task_status = 0 and task.final_charge_status = 0
             and case task.charge_stage
-            when 1 then d.manager_id = task.charge_one_id
-            when 2 then d.manager_id = task.charge_two_id
+            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)
             end
             <if test="queryBO.projectId != null">
                 and tf.project_id = #{queryBO.projectId}