Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -98,32 +98,48 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         task.setProductionEnterprise(automobileEnterprise.getEnterpriseName());
         BeanUtils.copyBeanProp(task, request);
 
-        Long systemReviewTaskId = null;
-        Long carReviewTaskId = null;
+        String nextNode = null;
 
-        if (request.getTaskList().contains(Task.SUB_TASK_SRAIF)) {
-            task.setNextNode(Task.SUB_TASK_SRAIF);
-            // 保存体系审查任务
-            systemReviewTaskId = saveSystemReview(request,initiator,standard,leader);
-        } else if (request.getTaskList().contains(Task.SUB_TASK_GRFIS)) {
-            task.setNextNode(Task.SUB_TASK_GRFIS);
-        } else if (request.getTaskList().contains(Task.SUB_TASK_TRFIS)) {
-            task.setNextNode(Task.SUB_TASK_TRFIS);
+        if(request.getTaskList().contains(Task.SUB_TASK_TRFIS)) {
+            nextNode = Task.SUB_TASK_TRFIS;
         }
-
-        if (request.getTaskList().contains(Task.SUB_TASK_GRFIS)) {
+        if(request.getTaskList().contains(Task.SUB_TASK_GRFIS)) {
             // 保存车型审查问卷任务
-            carReviewTaskId = saveCarReview(request,initiator,standard,leader);
+            nextNode = Task.SUB_TASK_GRFIS;;
+            task.setCarReviewTaskId(saveCarReview(request,initiator,standard,leader));
+        }
+        if(request.getTaskList().contains(Task.SUB_TASK_SRAIF)) {
+            // 保存体系审查任务
+            nextNode = Task.SUB_TASK_SRAIF;
+            task.setSystemReviewTaskId(saveSystemReview(request,initiator,standard,leader));
         }
 
-        task.setCarReviewTaskId(carReviewTaskId);
-        task.setSystemReviewTaskId(systemReviewTaskId);
-
+//        if (request.getTaskList().contains(Task.SUB_TASK_SRAIF)) {
+//            task.setNextNode(Task.SUB_TASK_SRAIF);
+//            // 保存体系审查任务
+//            systemReviewTaskId = saveSystemReview(request,initiator,standard,leader);
+//        } else if (request.getTaskList().contains(Task.SUB_TASK_GRFIS)) {
+//            task.setNextNode(Task.SUB_TASK_GRFIS);
+//        } else if (request.getTaskList().contains(Task.SUB_TASK_TRFIS)) {
+//            task.setNextNode(Task.SUB_TASK_TRFIS);
+//        }
+//
+//        if (request.getTaskList().contains(Task.SUB_TASK_GRFIS)) {
+//            // 保存车型审查问卷任务
+//            carReviewTaskId = saveCarReview(request,initiator,standard,leader);
+//        }
+//
+//        task.setCarReviewTaskId(carReviewTaskId);
+//        task.setSystemReviewTaskId(systemReviewTaskId);
+
+        task.setNextNode(nextNode);
         taskService.save(task);
+
         // 构建并保存该任务所关联的审核组信息
         for(TaskUserRelation auditor : auditors) {
             auditor.setTaskId(task.getId());
         }
+
         taskUserRelationService.saveBatch(auditors);
 
     }