Merge branch 'wangdingyi' into 'dev'

创新基地查询任务详情

See merge request !422

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

@@ -90,4 +90,10 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange
      * @return
      */
     List<ReviewSceneChangeTaskResponse> findFinishList(Long userId, ReviewSceneChangeTaskFindFinishRequest request);
+
+    /**
+     * 创新基地查询任务详情
+     * @return
+     */
+    ReviewSceneChangeTask getBySceneChange(Long id);
 }

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

@@ -367,6 +367,24 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
         return reviewSceneChangeTask;
     }
 
+    @Override
+    public ReviewSceneChangeTask getBySceneChange(Long id) {
+        ReviewSceneChangeTask reviewSceneChangeTask = getById(id);
+        //查询审核人员
+        List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.INNOVATION_BASE_ID);
+        List<SysUser> reviewerList = sysUserService.selectUserListByIds(reviewerIdList);
+
+        Set<String> reviewerNameSet = new HashSet<>();
+        for (SysUser reviewer : reviewerList) {
+            reviewerNameSet.add(reviewer.getNickName());
+        }
+
+        // 生成审核人员名字字符串
+        String reviewerNames = String.join("、", reviewerNameSet);
+        reviewSceneChangeTask.setReviewer(reviewerNames);
+        return reviewSceneChangeTask;
+    }
+
 }
 
 

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

@@ -129,4 +129,16 @@ public class ReviewSceneChangeTaskController extends BaseController {
         return getDataTable(reviewSceneChangeTaskService.findFinishList(getUserId(),request));
     }
 
+    /**
+     * 创新基地查询任务详情
+     * @return
+     */
+    @ApiOperation("查询任务详情")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/innovationBaseGetById")
+    public R<ReviewSceneChangeTask> innovationBaseGetById(@Validated @RequestBody ReviewSceneChangeTaskGetInfoRequest request) {
+        return R.ok(reviewSceneChangeTaskService.getBySceneChange(request.getId()));
+    }
+
 }