Merge branch 'wangdingyi' into 'dev'

创新基地查询已办列表

See merge request !421

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

@@ -61,7 +61,7 @@ public class ReviewSceneChangeTask {
     public static final Long REVIEW_ROLE_ID = 103L;
 
     /**
-     * 参与审核的角色
+     * 创新基地参与审核的角色
      */
     @TableField(exist = false)
     public static final Long INNOVATION_BASE_ID = 113L;

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

@@ -53,7 +53,13 @@ public interface ReviewSceneChangeTaskMapper extends BaseMapper<ReviewSceneChang
      * 创新基地查询待办列表
      * @return
      */
-    List<ReviewSceneChangeTaskResponse> findPendingList(@Param("userId")Long userId, @Param("request") ReviewSceneChangeTaskFindPendingRequest request);
+    List<ReviewSceneChangeTaskResponse> findPendingList(@Param("userId") Long userId, @Param("request") ReviewSceneChangeTaskFindPendingRequest request);
+
+    /**
+     * 创新基地查询已办列表
+     * @return
+     */
+    List<ReviewSceneChangeTaskResponse> findFinishList(@Param("userId") Long userId, @Param("request") ReviewSceneChangeTaskFindFinishRequest request);
 }
 
 

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

@@ -84,4 +84,10 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange
      * @return
      */
     List<ReviewSceneChangeTaskResponse> findPendingList(Long userId, ReviewSceneChangeTaskFindPendingRequest request);
+
+    /**
+     * 创新基地查询已办列表
+     * @return
+     */
+    List<ReviewSceneChangeTaskResponse> findFinishList(Long userId, ReviewSceneChangeTaskFindFinishRequest request);
 }

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

@@ -262,7 +262,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
         List<ReviewSceneChangeTaskResponse> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findFinishListByUserId(userId,request);
 
         //查询审核人员
-        List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(103L);
+        List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
         List<SysUser> reviewerList = sysUserService.selectUserListByIds(reviewerIdList);
         Set<String> reviewerNameSet = new HashSet<>();
         for (SysUser reviewer : reviewerList){
@@ -277,7 +277,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
     }
 
     /**
-     * 根据用户ID查询已办列表
+     * 查询当前用户发布的任务
      * @param userId
      * @return
      */
@@ -285,7 +285,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
     public List<ReviewSceneChangeTask> findCreateListByUserId(Long userId, ReviewSceneChangeTaskFindCreateRequest request) {
         List<ReviewSceneChangeTask> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findCreateListByUserId(userId,request);
         //查询审核人员
-        List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(103L);
+        List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
         List<SysUser> reviewerList = sysUserService.selectUserListByIds(reviewerIdList);
 
         Set<String> reviewerNameSet = new HashSet<>();
@@ -306,7 +306,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
     public ReviewSceneChangeTask getBySceneChangeTaskId(Long id) {
         ReviewSceneChangeTask reviewSceneChangeTask = reviewSceneChangeTaskMapper.findSceneChangeTaskById(id);
         //查询审核人员
-        List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(103L);
+        List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
         List<SysUser> reviewerList = sysUserService.selectUserListByIds(reviewerIdList);
 
         Set<String> reviewerNameSet = new HashSet<>();
@@ -344,6 +344,29 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
         return reviewSceneChangeTask;
     }
 
+    /**
+     * 创新基地查询已办列表
+     * @return
+     */
+    @Override
+    public List<ReviewSceneChangeTaskResponse> findFinishList(Long userId, ReviewSceneChangeTaskFindFinishRequest request) {
+        List<ReviewSceneChangeTaskResponse> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findFinishList(userId,request);
+
+        //查询审核人员
+        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);
+        for (ReviewSceneChangeTaskResponse taskResponse: reviewSceneChangeTask){
+            taskResponse.setReviewer(reviewerNames);
+        }
+        return reviewSceneChangeTask;
+    }
+
 }
 
 

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

@@ -116,4 +116,17 @@ public class ReviewSceneChangeTaskController extends BaseController {
         return getDataTable(reviewSceneChangeTaskService.findPendingList(getUserId(),request));
     }
 
+    /**
+     * 创新基地查询已办列表
+     * @return
+     */
+    @ApiOperation("创新基地查询已办列表")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/innovationBaseFindFinish")
+    public TableDataInfo<ReviewSceneChangeTaskResponse> innovationBaseFindFinish(@Validated @RequestBody ReviewSceneChangeTaskFindFinishRequest request) {
+        startPage(request);
+        return getDataTable(reviewSceneChangeTaskService.findFinishList(getUserId(),request));
+    }
+
 }

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

@@ -115,9 +115,11 @@
             and inspect_standard_id = #{request.inspectStandardId}
         </if>
     </select>
+
     <select id="findSceneChangeTaskById" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
         select * from t_review_scene_change_task where id = #{id}
     </select>
+
     <select id="findPendingList" resultType="com.ruoyi.web.response.ReviewSceneChangeTaskResponse">
         SELECT sct.*, sctu.decision FROM t_review_scene_change_task sct
         LEFT JOIN t_review_scene_change_task_user_relation sctu ON sct.id = sctu.task_id
@@ -136,4 +138,22 @@
         </if>
     </select>
 
+    <select id="findFinishList" resultType="com.ruoyi.web.response.ReviewSceneChangeTaskResponse">
+        SELECT sct.*, sctu.decision FROM t_review_scene_change_task sct
+        LEFT JOIN t_review_scene_change_task_user_relation sctu ON sct.id = sctu.task_id
+        WHERE sctu.user_id = #{userId} and sctu.decision IS NOT NULL
+        <if test="request.operationSort != null and request.operationSort != ''">
+            and sct.operation_sort = #{request.operationSort}
+        </if>
+        <if test="request.type != null and request.type != ''">
+            and sct.type = #{request.type}
+        </if>
+        <if test="request.keyword != null and request.keyword != ''">
+            and (sct.old_text like concat('%',#{request.keyword},'%') || sct.new_text like concat('%',#{request.keyword},'%'))
+        </if>
+        <if test="request.inspectStandardId != null and request.inspectStandardId != ''">
+            and inspect_standard_id = #{request.inspectStandardId}
+        </if>
+    </select>
+
 </mapper>