Merge branch 'wangdingyi' into 'dev'

创新基地查询待办列表

See merge request !420

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

@@ -60,6 +60,12 @@ public class ReviewSceneChangeTask {
     @TableField(exist = false)
     public static final Long REVIEW_ROLE_ID = 103L;
 
+    /**
+     * 参与审核的角色
+     */
+    @TableField(exist = false)
+    public static final Long INNOVATION_BASE_ID = 113L;
+
     /**
      * 主键
      */
@@ -219,4 +225,7 @@ public class ReviewSceneChangeTask {
     @TableField(exist = false)
     private String reviewer;
 
+    @ApiModelProperty("创新基地结果")
+    private String innovationBaseResult;
+
 }

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

@@ -48,6 +48,12 @@ public interface ReviewSceneChangeTaskMapper extends BaseMapper<ReviewSceneChang
     * 根据id查询任务详细信息
     * */
     ReviewSceneChangeTask findSceneChangeTaskById(@Param("id") Long id);
+
+    /**
+     * 创新基地查询待办列表
+     * @return
+     */
+    List<ReviewSceneChangeTaskResponse> findPendingList(@Param("userId")Long userId, @Param("request") ReviewSceneChangeTaskFindPendingRequest request);
 }
 
 

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

@@ -78,4 +78,10 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange
     List<ReviewSceneChangeTask> findCreateListByUserId(Long userId, ReviewSceneChangeTaskFindCreateRequest request);
 
     ReviewSceneChangeTask getBySceneChangeTaskId(Long id);
+
+    /**
+     * 创新基地查询待办列表
+     * @return
+     */
+    List<ReviewSceneChangeTaskResponse> findPendingList(Long userId, ReviewSceneChangeTaskFindPendingRequest request);
 }

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

@@ -77,6 +77,20 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
         // 保存任务
         save(reviewSceneChangeTask);
 
+        // 绑定创新基地人员
+        List<SysUser> InnovationSysUsers = sysUserService.selectUserListByRoleId(ReviewSceneChangeTask.INNOVATION_BASE_ID);
+        List<ReviewSceneChangeTaskUserRelation> InnovationRelations = new ArrayList();
+        for(SysUser sysUser : InnovationSysUsers) {
+            ReviewSceneChangeTaskUserRelation relation = new ReviewSceneChangeTaskUserRelation()
+                    .setTaskId(reviewSceneChangeTask.getId())
+                    .setUserId(sysUser.getUserId())
+                    .setName(sysUser.getNickName())
+                    .setDept(sysUser.getDept().getDeptName());
+            InnovationRelations.add(relation);
+        }
+
+        reviewSceneChangeTaskUserRelationService.saveBatch(InnovationRelations);
+
         // 绑定审核人
         List<SysUser> sysUsers = sysUserService.selectUserListByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
         List<ReviewSceneChangeTaskUserRelation> relations = new ArrayList();
@@ -223,7 +237,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
         List<ReviewSceneChangeTaskResponse> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findPendingListByUserId(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){
@@ -306,6 +320,30 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
         return reviewSceneChangeTask;
     }
 
+    /**
+     * 创新基地查询待办列表
+     * @return
+     */
+    @Override
+    public List<ReviewSceneChangeTaskResponse> findPendingList(Long userId, ReviewSceneChangeTaskFindPendingRequest request) {
+        List<ReviewSceneChangeTaskResponse> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findPendingList(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

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

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

@@ -166,4 +166,7 @@ public class ReviewSceneChangeTaskResponse {
     @ApiModelProperty("评审人员")
     @TableField(exist = false)
     private String reviewer;
+
+    @ApiModelProperty("创新基地结果")
+    private String innovationBaseResult;
 }

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

@@ -24,6 +24,7 @@
             <result property="taskEndTime" column="task_end_time" jdbcType="TIMESTAMP"/>
             <result property="inspectStandardId" column="inspect_standard_id" jdbcType="BIGINT"/>
             <result property="inspectStandardNo" column="inspect_standard_no" jdbcType="VARCHAR"/>
+            <result property="innovationBaseResult" column="innovation_base_result" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="ResponseResultMap" type="com.ruoyi.web.response.ReviewSceneChangeTaskResponse">
@@ -47,6 +48,7 @@
         <result property="decision" column="decision" jdbcType="VARCHAR"/>
         <result property="inspectStandardId" column="inspect_standard_id" jdbcType="BIGINT"/>
         <result property="inspectStandardNo" column="inspect_standard_no" jdbcType="VARCHAR"/>
+        <result property="innovationBaseResult" column="innovation_base_result" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="findLastChangeByTaskId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
@@ -60,6 +62,7 @@
         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 NULL
+        and sct.innovation_base_result = 'PASS'
         <if test="request.operationSort != null and request.operationSort != ''">
             and sct.operation_sort = #{request.operationSort}
         </if>
@@ -78,6 +81,7 @@
         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
+        and sct.innovation_base_result = 'PASS'
         <if test="request.operationSort != null and request.operationSort != ''">
             and sct.operation_sort = #{request.operationSort}
         </if>
@@ -114,5 +118,22 @@
     <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
+        WHERE sctu.user_id = #{userId} and sctu.decision IS 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>