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

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

@@ -152,4 +152,7 @@ public class Task {
 
     @ApiModelProperty("文件路径")
     private String file;
+
+    @ApiModelProperty("选择的项目")
+    private String taskList;
 }

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

@@ -62,6 +62,9 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
     @Autowired
     private SampleManagementMapper sampleManagementMapper;
 
+    @Autowired
+    private ReviewEnterpriseArchiveMapper reviewEnterpriseArchiveMapper;
+
     // PENDING状态下
     // 1.standard字段查询当前最新问卷
     // 2.查询场景变更任务
@@ -165,6 +168,10 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
                     if(reviewDetailsResult != null && reviewDetailsResult.getPassed() != 0) {
                         standard.setPassed(reviewDetailsResult.getPassed());
                     }
+                    if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
+                        ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
+                        reviewDetailsResult.setEnterpriseName(reviewEnterpriseArchive.getEnterpriseName());
+                    }
                     details.setResult(reviewDetailsResult);
                 }
             }

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

@@ -59,6 +59,9 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
     @Autowired
     private SampleManagementMapper sampleManagementMapper;
 
+    @Autowired
+    private ReviewEnterpriseArchiveMapper reviewEnterpriseArchiveMapper;
+
     @Override
     public void doStart(SystemReviewTask systemReviewTask) {
         throw new ServiceException("不能开始一个已经开始的任务", HttpStatus.ERROR);
@@ -168,6 +171,10 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
                     if(reviewDetailsResult != null && reviewDetailsResult.getPassed() != 0) {
                         standard.setPassed(reviewDetailsResult.getPassed());
                     }
+                    if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
+                        ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
+                        reviewDetailsResult.setEnterpriseName(reviewEnterpriseArchive.getEnterpriseName());
+                    }
                     details.setResult(reviewDetailsResult);
                 }
             }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.domain.*;
 import com.ruoyi.mapper.*;
@@ -113,6 +114,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         task.setName(standard.getName());
         task.setStandardNo(standard.getStandardNo());
         task.setFile(standard.getFile());
+        String joinTaskList = StringUtils.join(request.getTaskList(),",");
+        task.setTaskList(joinTaskList);
         BeanUtils.copyBeanProp(task, request);
 
         if(request.getTaskList().contains(Task.SUB_TASK_GRFIS)) {
@@ -194,6 +197,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         Task task = new Task();
         task.setLeaderId(leader.getUserId());
         task.setLeader(leader.getName());
+        String joinTaskList = StringUtils.join(request.getTaskList(),",");
+        task.setTaskList(joinTaskList);
         BeanUtils.copyBeanProp(task, request);
 
         taskService.updateById(task);

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

@@ -62,9 +62,9 @@ public class ReviewEnterpriseArchiveController extends BaseController {
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @Log(title = "车企文件", businessType = BusinessType.INSERT)
     @RequestMapping(method = RequestMethod.POST, value = "/add")
-    public R<Long> addEnterpriseArchive(@Validated @RequestBody ReviewEnterpriseArchive reviewEnterpriseArchive) {
+    public R<String> addEnterpriseArchive(@Validated @RequestBody ReviewEnterpriseArchive reviewEnterpriseArchive) {
         reviewEnterpriseArchiveService.addEnterpriseArchive(reviewEnterpriseArchive);
-        return R.ok(reviewEnterpriseArchive.getId());
+        return R.ok(reviewEnterpriseArchive.getId().toString());
     }
 
     @ApiOperation("编辑车企文件")

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

@@ -116,6 +116,9 @@ public class TaskGetInfoResponse {
     @ApiModelProperty("文件路径")
     private String file;
 
+    @ApiModelProperty("选择的项目")
+    private String taskList;
+
     @ApiModelProperty("小组成员")
     private List<TaskUserRelation> auditors;
 

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

@@ -34,6 +34,7 @@
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
         <result property="file" column="file" jdbcType="VARCHAR"/>
+        <result property="taskList" column="task_list" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="ResponseMap" type="com.ruoyi.web.response.TaskFindResponse">
@@ -162,7 +163,7 @@
     </select>
     <select id="findByUserId" resultMap="ResponseMap">
         SELECT t.id, t.system_review_task_id, t.car_review_task_id,
-               t.task_no,t.task_name,t.task_status,t.name,
+               t.task_no,t.task_name,t.task_status,t.run_status,t.name,
                t.product_model,
                t.leader_id,t.leader,
                t.task_begin_time,