Merge branch 'wangdingyi' into 'dev'

创建任务代码修改

See merge request !64

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

@@ -94,9 +94,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         task.setName(standard.getName());
         task.setStandardNo(standard.getStandardNo());
         task.setFile(standard.getFile());
-        AutomobileEnterprise automobileEnterprise = automobileEnterpriseMapper.selectById(request.getProductionId());
-        task.setProductionEnterprise(automobileEnterprise.getEnterpriseName());
         BeanUtils.copyBeanProp(task, request);
+        AutomobileEnterprise automobileEnterprise = automobileEnterpriseMapper.selectAutomobileEnterpriseById(request.getProductionId());
+        task.setProductionEnterprise(automobileEnterprise.getEnterpriseName());
+
 
         String nextNode = null;
 
@@ -114,24 +115,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             task.setSystemReviewTaskId(saveSystemReview(request,initiator,standard,leader));
         }
 
-//        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);