完成检查

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

@@ -530,11 +530,17 @@ public class TaskController {
         }
         //检查是否要核验成果文件
         Task curTask = taskMapper.selectById(task.getId());
-        if (curTask.getAttachFileRequired()) {
+        if (curTask.getAttachFileRequired() && task.getTaskStatus() == 0) {
             Integer cnt = taskFilesMapper.selectCount(new QueryWrapper<TaskFiles>().eq("task_id",task.getId()));
             if (cnt == 0) {
-                msg.setError("当前任务必须要上传任务成果才可以完成");
+                msg.setError("当前任务必须要上传成果附件才可以完成");
                 return msg;
+            } else {
+                cnt = taskFilesMapper.selectCount(new QueryWrapper<TaskFiles>().eq("task_id",task.getId()).eq("final_charge_status",0));
+                if (cnt > 0) {
+                    msg.setError("当前任务存在尚未审核通过的成果附件，不可完成");
+                    return msg;
+                }
             }
         }