Merge branch 'wangdingyi' into 'dev'

创新基地审核任务

See merge request !423

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

@@ -80,4 +80,7 @@ public class ReviewSceneChangeTaskUserRelation {
     @ApiModelProperty("部门名称")
     private String dept;
 
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
 }

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

@@ -96,4 +96,10 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange
      * @return
      */
     ReviewSceneChangeTask getBySceneChange(Long id);
+
+    /**
+     * 创新基地审核任务
+     * @return
+     */
+    void innovationBaseAudit(ReviewSceneChangeTaskPassRequest request);
 }

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

 package com.ruoyi.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.toolkit.Db;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
@@ -85,7 +86,8 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
                     .setTaskId(reviewSceneChangeTask.getId())
                     .setUserId(sysUser.getUserId())
                     .setName(sysUser.getNickName())
-                    .setDept(sysUser.getDept().getDeptName());
+                    .setDept(sysUser.getDept().getDeptName())
+                    .setRoleId(ReviewSceneChangeTask.INNOVATION_BASE_ID);
             InnovationRelations.add(relation);
         }
 
@@ -99,7 +101,8 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
                     .setTaskId(reviewSceneChangeTask.getId())
                     .setUserId(sysUser.getUserId())
                     .setName(sysUser.getNickName())
-                    .setDept(sysUser.getDept().getDeptName());
+                    .setDept(sysUser.getDept().getDeptName())
+                    .setRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
             relations.add(relation);
         }
 
@@ -140,7 +143,11 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
         // 1.获取该任务的所有审批人
         // 2.获取当前用户对应的审批信息
         // 3.保存评审意见
-        List<ReviewSceneChangeTaskUserRelation> relations = reviewSceneChangeTaskUserRelationService.findListByTaskId(taskId);
+//        List<ReviewSceneChangeTaskUserRelation> relations = reviewSceneChangeTaskUserRelationService.findListByTaskId(taskId);
+        List<ReviewSceneChangeTaskUserRelation> relations = Db.lambdaQuery(ReviewSceneChangeTaskUserRelation.class)
+                .eq(ReviewSceneChangeTaskUserRelation::getTaskId, taskId)
+                .eq(ReviewSceneChangeTaskUserRelation::getRoleId, ReviewSceneChangeTask.REVIEW_ROLE_ID)
+                .list();
         for(ReviewSceneChangeTaskUserRelation relation : relations) {
             if(relation.getUserId().equals(loginUser.getUserId())) {
                 relation.setDecision(decision);
@@ -385,6 +392,64 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
         return reviewSceneChangeTask;
     }
 
+    /**
+     * 创新基地审核任务
+     * @return
+     */
+    @Override
+    public void innovationBaseAudit(ReviewSceneChangeTaskPassRequest request) {
+        if (request.getPassed().equals(ReviewSceneChangeTask.PASSED_REJECT)) {
+            innovationBaseDoProcess(request.getTaskId(), request.getComment(), ReviewSceneChangeTask.RESULT_REJECT);
+        } else if(request.getPassed().equals(ReviewSceneChangeTask.PASSED_PASS)){
+            innovationBaseDoProcess(request.getTaskId(), request.getComment(), ReviewSceneChangeTask.RESULT_PASS);
+        } else {
+            throw new ServiceException("审核状态不正确",HttpStatus.ERROR);
+        }
+    }
+
+    /**
+     * 创新基地评审任务
+     * @param taskId
+     * @param comment
+     * @param decision
+     */
+    public void innovationBaseDoProcess(Long taskId, String comment, String decision) {
+
+        ReviewSceneChangeTask task = getById(taskId);
+        checkTaskStatus(task.getTaskStatus());
+
+        // 获取当前登陆人
+        SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+
+        // 1.获取该任务的所有审批人
+        // 2.获取当前用户对应的审批信息
+        // 3.保存评审意见
+//        List<ReviewSceneChangeTaskUserRelation> relations = reviewSceneChangeTaskUserRelationService.findListByTaskId(taskId);
+        List<ReviewSceneChangeTaskUserRelation> relations = Db.lambdaQuery(ReviewSceneChangeTaskUserRelation.class)
+                .eq(ReviewSceneChangeTaskUserRelation::getTaskId, taskId)
+                .eq(ReviewSceneChangeTaskUserRelation::getRoleId, ReviewSceneChangeTask.INNOVATION_BASE_ID)
+                .list();
+        for(ReviewSceneChangeTaskUserRelation relation : relations) {
+            if(relation.getUserId().equals(loginUser.getUserId())) {
+                relation.setDecision(decision);
+                relation.setComment(comment);
+                relation.setDecisionTime(new Date());
+                reviewSceneChangeTaskUserRelationService.updateById(relation);
+                break;
+            }
+        }
+
+        // 判断当前任务是否全员审核完毕，如果是则给innovation_base_result赋值
+        if(isFinish(relations)) {
+
+            task.setInnovationBaseResult(isPassed(relations) ? ReviewSceneChangeTaskUserRelation.DECISION_PASS : ReviewSceneChangeTaskUserRelation.DECISION_REJECT);
+
+            reviewSceneChangeTaskService.updateById(task);
+
+        }
+
+    }
+
 }
 
 

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

@@ -141,4 +141,18 @@ public class ReviewSceneChangeTaskController extends BaseController {
         return R.ok(reviewSceneChangeTaskService.getBySceneChange(request.getId()));
     }
 
+    /**
+     * 创新基地审核任务
+     * @return
+     */
+    @ApiOperation("审核任务")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @Log(title = "审核任务", businessType = BusinessType.UPDATE)
+    @RequestMapping(method = RequestMethod.POST, value = "/innovationBaseAudit")
+    public R<String> innovationBaseAudit(@Validated @RequestBody ReviewSceneChangeTaskPassRequest request) {
+        reviewSceneChangeTaskService.innovationBaseAudit(request);
+        return R.ok();
+    }
+
 }

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

@@ -7,10 +7,13 @@
     <resultMap id="BaseResultMap" type="com.ruoyi.domain.ReviewSceneChangeTaskUserRelation">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="taskId" column="task_id" jdbcType="BIGINT"/>
+            <result property="roleId" column="role_id" jdbcType="BIGINT"/>
             <result property="userId" column="user_id" jdbcType="BIGINT"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="dept" column="dept" jdbcType="VARCHAR"/>
             <result property="decision" column="decision" jdbcType="VARCHAR"/>
+            <result property="comment" column="comment" jdbcType="VARCHAR"/>
             <result property="decisionTime" column="decision_time" jdbcType="TIMESTAMP"/>
-            <result property="name" column="name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -18,6 +21,7 @@
         decision_time,name
     </sql>
     <select id="findListByTaskId" resultType="com.ruoyi.domain.ReviewSceneChangeTaskUserRelation">
-        SELECT id, task_id, user_id, decision, decision_time, name FROM t_review_scene_change_task_user_relation WHERE task_id = #{taskId}
+        SELECT id, task_id, user_id, decision, decision_time, name, role_id, comment, dept FROM t_review_scene_change_task_user_relation
+        WHERE task_id = #{taskId}
     </select>
 </mapper>