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

quality-review/src/main/java/com/ruoyi/domain/ModelTestTask.java

@@ -115,4 +115,7 @@ public class ModelTestTask {
     @ApiModelProperty("车型试验标准条款数")
     private Integer standards;
 
+    @ApiModelProperty("试验方案ID")
+    private String testSchemeId;
+
 }

quality-review/src/main/java/com/ruoyi/domain/TestUseCase.java

@@ -87,6 +87,9 @@ public class TestUseCase implements Serializable {
     @TableField(exist = false)
     private String testType;
 
+    @ApiModelProperty("用例ID")
+    private String caseId;
+
     /**
      * 返回用例在矩阵中的坐标
      * @return
@@ -95,4 +98,4 @@ public class TestUseCase implements Serializable {
         return String.valueOf(testScenarioId) + String.valueOf(testTypeId);
     }
 
-}
+}
\ No newline at end of file

quality-review/src/main/java/com/ruoyi/domain/vo/TestUsecaseVO.java

@@ -21,6 +21,9 @@ public class TestUsecaseVO {
     @ApiModelProperty("测试用例ID")
     private Long id;
 
+    @ApiModelProperty("用例ID")
+    private String caseId;
+
     @ApiModelProperty("测试场景")
     private String testScenario;
 

quality-review/src/main/java/com/ruoyi/mapper/TaskMapper.java

@@ -35,4 +35,6 @@ public interface TaskMapper extends BaseMapper<Task> {
     Task getByUserIdTemporary(@Param("userId") Long userId);
 
     Task getBySubtaskId(@Param("subId") Long subId);
+
+    Long findTaskName(@Param("taskName") String taskName);
 }

quality-review/src/main/java/com/ruoyi/service/TaskState.java

 package com.ruoyi.service;
 
 import com.ruoyi.domain.Task;
+import com.ruoyi.web.request.TaskStartRequest;
 
 import java.util.List;
 
 public interface TaskState {
 
     void doCreate(Task task, List<String> taskList);
-    void doStart(Task task);
+    void doStart(Task task, TaskStartRequest request);
     void doSubmit(Task task);
 
 

quality-review/src/main/java/com/ruoyi/service/TestUseCaseService.java

@@ -26,5 +26,5 @@ public interface TestUseCaseService extends IService<TestUseCase> {
      * @param request
      * @return
      */
-    List<Long> selectCaseIdList(TestUseCaseIdListRequest request);
+    List<String> selectCaseIdList(TestUseCaseIdListRequest request);
 }

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

@@ -73,8 +73,8 @@ public class MatrixServiceImpl implements MatrixService {
             for(TestType type : types) {
                 String columnId = String.valueOf(type.getId());
                 String coordinates = scenario.getId() + columnId;
-                Long useCaseId = getUseCaseIdByCoordinates(useCases, coordinates);
-                row.put(columnId, useCaseId == null ? "" : String.valueOf(useCaseId));
+                String useCaseId = getUseCaseIdByCoordinates(useCases, coordinates);
+                row.put(columnId, useCaseId == null ? "" : useCaseId);
             }
 
             rows.add(row);
@@ -83,11 +83,11 @@ public class MatrixServiceImpl implements MatrixService {
         response.setRows(rows);
     }
 
-    public Long getUseCaseIdByCoordinates(List<TestUseCase> useCases, String coordinates) {
+    public String getUseCaseIdByCoordinates(List<TestUseCase> useCases, String coordinates) {
 
         for(TestUseCase useCase : useCases) {
             if(useCase.getCoordinates().equals(coordinates)) {
-                return useCase.getId();
+                return useCase.getCaseId();
             }
         }
         return null;

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

@@ -5,8 +5,10 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.DataStatisticsUtils;
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -17,6 +19,7 @@ import com.ruoyi.service.*;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.web.request.*;
 import com.ruoyi.web.response.DataStatisticsResponse;
+import com.ruoyi.web.response.ResultCountResponse;
 import com.ruoyi.web.response.TaskFindResponse;
 import com.ruoyi.web.response.TaskGetInfoResponse;
 import org.apache.poi.ss.formula.functions.T;
@@ -105,70 +108,76 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
     @Override
     public void createTask(TaskCreateRequest request) {
 
-        // 构建任务创建者
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        SysUser initiator = sysUserService.selectUserById(loginUser.getUserId());
-        Standard standard = standardService.findListById(request.getStandardId());
+        Long sum = taskMapper.findTaskName(request.getTaskName());
 
-        // 找到审查组长
-        TaskUserRelation leader = null;
-        List<TaskUserRelation> auditors = request.getAuditors();
-        for(TaskUserRelation auditor : auditors) {
-            if(auditor.getIsLeader() == 1) {
-                leader = auditor;
-                break;
+        if (sum > 0) {
+            throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR);
+        } else {
+            // 构建任务创建者
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            SysUser initiator = sysUserService.selectUserById(loginUser.getUserId());
+            Standard standard = standardService.findListById(request.getStandardId());
+
+            // 找到审查组长
+            TaskUserRelation leader = null;
+            List<TaskUserRelation> auditors = request.getAuditors();
+            for(TaskUserRelation auditor : auditors) {
+                if(auditor.getIsLeader() == 1) {
+                    leader = auditor;
+                    break;
+                }
             }
-        }
 
-        // 构建并保存任务信息
-        // 总任务
-        Task task = new Task();
-        task.setTaskInitiatorId(loginUser.getUserId());
-        task.setTaskInitiator(initiator.getNickName());
-        if (initiator.getDept() != null) {
-            task.setTaskInitiatorDept(initiator.getDept().getDeptName());
-        }
-        task.setTaskStatus(Task.TASK_STATUS_NEW);
-        task.setRunStatus(Task.RUN_STATUS_RUNNABLE);
-        task.setLeaderId(leader.getUserId());
-        task.setLeader(leader.getName());
-        task.setCreateTime(new Date());
-        task.setName(standard.getName());
-        task.setStandardNo(standard.getStandardNo());
-        task.setFile(standard.getFile());
-        setTaskList(request.getTaskList(),task);
-        BeanUtils.copyBeanProp(task, request);
+            // 构建并保存任务信息
+            // 总任务
+            Task task = new Task();
+            task.setTaskInitiatorId(loginUser.getUserId());
+            task.setTaskInitiator(initiator.getNickName());
+            if (initiator.getDept() != null) {
+                task.setTaskInitiatorDept(initiator.getDept().getDeptName());
+            }
+            task.setTaskStatus(Task.TASK_STATUS_NEW);
+            task.setRunStatus(Task.RUN_STATUS_RUNNABLE);
+            task.setLeaderId(leader.getUserId());
+            task.setLeader(leader.getName());
+            task.setCreateTime(new Date());
+            task.setName(standard.getName());
+            task.setStandardNo(standard.getStandardNo());
+            task.setFile(standard.getFile());
+            setTaskList(request.getTaskList(),task);
+            BeanUtils.copyBeanProp(task, request);
 
-        if(request.getTaskList().contains(Task.SUB_TASK_GRFIS)) {
-            // 保存车型审查问卷任务
-            task.setCarReviewTaskId(saveCarReview(request,initiator,standard,leader));
-        }
-        if(request.getTaskList().contains(Task.SUB_TASK_SRAIF)) {
-            // 保存体系审查任务
-            task.setSystemReviewTaskId(saveSystemReview(request,initiator,standard,leader));
-        }
-        if (request.getTaskList().contains(Task.SUB_TASK_TRFIS)) {
-            task.setModelTestTaskId(saveModelTest(request, initiator, standard, leader));
-        }
+            if(request.getTaskList().contains(Task.SUB_TASK_GRFIS)) {
+                // 保存车型审查问卷任务
+                task.setCarReviewTaskId(saveCarReview(request,initiator,standard,leader));
+            }
+            if(request.getTaskList().contains(Task.SUB_TASK_SRAIF)) {
+                // 保存体系审查任务
+                task.setSystemReviewTaskId(saveSystemReview(request,initiator,standard,leader));
+            }
+            if (request.getTaskList().contains(Task.SUB_TASK_TRFIS)) {
+                task.setModelTestTaskId(saveModelTest(request, initiator, standard, leader));
+            }
 
-        taskService.save(task);
+            taskService.save(task);
 
-        // 总任务包含车型试验，添加任务-场景关联信息
-        saveTaskScenario(task.getId(), request.getTestScenarioList());
+            // 总任务包含车型试验，添加任务-场景关联信息
+            saveTaskScenario(task.getId(), request.getTestScenarioList());
 
-        // 构建并保存该任务所关联的审核组信息
-        saveUserRelation(auditors,task);
+            // 构建并保存该任务所关联的审核组信息
+            saveUserRelation(auditors,task);
 
-        // 保存关联的整车样品信息和零部件样品信息
-        List<TaskSampleRelation> relations = request.getSample();
-        List<TaskSampleRelation> partRelations = request.getPartSample();
-        saveSampleRelation(relations,partRelations,task);
+            // 保存关联的整车样品信息和零部件样品信息
+            List<TaskSampleRelation> relations = request.getSample();
+            List<TaskSampleRelation> partRelations = request.getPartSample();
+            saveSampleRelation(relations,partRelations,task);
 
-        taskStateFacade.doCreate(task, request.getTaskList());
+            taskStateFacade.doCreate(task, request.getTaskList());
 
-        TaskGetInfoResponse temporaryStorageTask = taskService.getByUserId(loginUser.getUserId());
-        if(temporaryStorageTask != null) {
-            taskMapper.deleteById(temporaryStorageTask.getId());
+            TaskGetInfoResponse temporaryStorageTask = taskService.getByUserId(loginUser.getUserId());
+            if(temporaryStorageTask != null) {
+                taskMapper.deleteById(temporaryStorageTask.getId());
+            }
         }
     }
 
@@ -267,7 +276,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
     @Override
     public void startTask(TaskStartRequest request) {
         Task task = taskMapper.selectById(request.getId());
-        taskStateFacade.doStart(task);
+        taskStateFacade.doStart(task, request);
     }
 
     @Override

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

 package com.ruoyi.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.domain.ModelTestTask;
 import com.ruoyi.domain.Task;
-import com.ruoyi.service.CarReviewTaskService;
-import com.ruoyi.service.SystemReviewTaskService;
-import com.ruoyi.service.TaskService;
-import com.ruoyi.service.TaskState;
+import com.ruoyi.service.*;
+import com.ruoyi.web.request.TaskStartRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -24,8 +24,12 @@ public abstract class TaskStateAdapter implements TaskState {
 
     @Autowired
     private TaskService taskService;
+
+    @Autowired
+    private ModelTestTaskService modelTestTaskService;
+
     @Override
-    public void doStart(Task task) {
+    public void doStart(Task task, TaskStartRequest request) {
 
         task.setTaskStatus(Task.TASK_STATUS_PENDING);
         task.setRunStatus(Task.RUN_STATUS_STATUS_RUNNING);
@@ -36,6 +40,14 @@ public abstract class TaskStateAdapter implements TaskState {
         } else if (Objects.equals(task.getNextNode(), Task.SUB_TASK_GRFIS)) {
             carReviewTaskService.startReviewTask(task.getCarReviewTaskId());
             taskService.updateById(task);
+        } else if (Objects.equals(task.getNextNode(), Task.SUB_TASK_TRFIS)) {
+            modelTestTaskService.startModelTestTask(task.getModelTestTaskId());
+            // 更新车型试验的试验方案ID
+            modelTestTaskService.update(new ModelTestTask(),
+                    new LambdaUpdateWrapper<ModelTestTask>()
+                            .set(ModelTestTask::getTestSchemeId, request.getTestSchemeId())
+                            .eq(ModelTestTask::getId, task.getModelTestTaskId()));
+            taskService.updateById(task);
         } else {
             throw new ServiceException("已没有可执行的子任务节点", HttpStatus.ERROR);
         }

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

@@ -2,6 +2,7 @@ package com.ruoyi.service.impl;
 
 import com.ruoyi.domain.Task;
 import com.ruoyi.service.TaskState;
+import com.ruoyi.web.request.TaskStartRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,8 +22,8 @@ public class TaskStateFacade implements TaskState {
     }
 
     @Override
-    public void doStart(Task task) {
-        taskStateContext.getResource(task.getTaskStatus()).doStart(task);
+    public void doStart(Task task, TaskStartRequest request) {
+        taskStateContext.getResource(task.getTaskStatus()).doStart(task, request);
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.domain.Task;
 import com.ruoyi.service.TaskState;
+import com.ruoyi.web.request.TaskStartRequest;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -28,7 +29,7 @@ public class TaskStateFinish extends TaskStateAdapter implements TaskState, Init
     }
 
     @Override
-    public void doStart(Task task) {
+    public void doStart(Task task, TaskStartRequest request) {
         throw new ServiceException("不能开始一个已经结束的任务", HttpStatus.ERROR);
     }
 

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

@@ -41,9 +41,9 @@ public class TestUseCaseServiceImpl extends ServiceImpl<TestUseCaseMapper, TestU
     }
 
     @Override
-    public List<Long> selectCaseIdList(TestUseCaseIdListRequest request) {
+    public List<String> selectCaseIdList(TestUseCaseIdListRequest request) {
         List<TestUsecaseVO> list = testUseCaseMapper.selectListByTaskId(request.getModelTestId());
-        return list.stream().map(TestUsecaseVO::getId).collect(Collectors.toList());
+        return list.stream().map(TestUsecaseVO::getCaseId).collect(Collectors.toList());
     }
 
 }

quality-review/src/main/java/com/ruoyi/web/TestUserCaseController.java

@@ -44,7 +44,7 @@ public class TestUserCaseController extends BaseController{
     @Anonymous
     @ApiOperation("根据场景查询用例ID集合")
     @PostMapping("/getCaseIdList")
-    public R<List<Long>> getCaseIdList(@Validated @RequestBody TestUseCaseIdListRequest request) {
+    public R<List<String>> getCaseIdList(@Validated @RequestBody TestUseCaseIdListRequest request) {
         return R.ok(testUseCaseService.selectCaseIdList(request));
     }
 }

quality-review/src/main/java/com/ruoyi/web/request/TaskStartRequest.java

@@ -10,4 +10,8 @@ public class TaskStartRequest {
 
     @ApiModelProperty("ID")
     private Long id;
+
+    @ApiModelProperty("试验方案ID")
+    private String testSchemeId;
+
 }

quality-review/src/main/java/com/ruoyi/web/response/ResultCountResponse.java

+package com.ruoyi.web.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("计算问卷结果VO")
+public class ResultCountResponse {
+
+    @ApiModelProperty("任务id")
+    private Long taskId;
+
+    @ApiModelProperty("任务状态")
+    private String taskStatus;
+
+    @ApiModelProperty("进度")
+    private Double schedule;
+}

quality-review/src/main/java/com/ruoyi/web/response/TaskFindResponse.java

@@ -118,4 +118,7 @@ public class TaskFindResponse {
     @ApiModelProperty("指向待执行节点的指针[0、1、2]")
     private int pointer;
 
+    @ApiModelProperty("试验方案ID")
+    private String testSchemeId;
+
 }

quality-review/src/main/resources/mapper/ReviewEnterpriseArchiveMapper.xml

@@ -54,7 +54,6 @@
                 and identify_number like concat('%',#{identifyNumber},'%')
             </if>
         </where>
-        ORDER BY create_time DESC
     </select>
     <select id="findByFileName" resultType="com.ruoyi.domain.ReviewEnterpriseArchive">
         SELECT id, enterprise_name, file_name, version, publish_date, status, identify_number, storage, photo, task_id, create_by, create_time
@@ -81,6 +80,5 @@
                 and identify_number like concat('%',#{identifyNumber},'%')
             </if>
         </where>
-        ORDER BY create_time DESC
     </select>
 </mapper>

quality-review/src/main/resources/mapper/TaskMapper.xml

@@ -106,7 +106,8 @@
                crt.task_status car_review_status,
                mtt.task_begin_time test_begin_time,
                mtt.task_end_time test_end_time,
-               mtt.task_status test_status
+               mtt.task_status test_status,
+               mtt.test_scheme_id testSchemeId
         FROM t_task t
         left join t_system_review_task srt on t.system_review_task_id = srt.id
         left join t_car_review_task crt on t.car_review_task_id = crt.id
@@ -276,6 +277,10 @@
         FROM t_task
         WHERE system_review_task_id = #{subId} OR car_review_task_id = #{subId}
     </select>
+    <select id="findTaskName" resultType="java.lang.Long">
+        select COUNT(*) sum from t_task
+        where task_name = #{taskName}
+    </select>
 
 
 </mapper>

quality-review/src/main/resources/mapper/TestUseCaseMapper.xml

@@ -51,6 +51,7 @@
     <select id="selectListByTaskId" resultType="com.ruoyi.domain.vo.TestUsecaseVO">
         select
             tu.id,
+            tu.case_id caseId,
             ts.test_scenario testScenario,
             tt.test_type testType,
             tu.usecase_no usecaseNo,