Merge branch 'songyuanshuo' into 'master'

修改查询评审列表sql

See merge request !5

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

@@ -178,6 +178,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
             if(task.getTaskResult().equals(ReviewSceneChangeTaskUserRelation.DECISION_PASS)) {
                 // 更新审核标准
                 reviewSceneService.change(task);
+                // TODO 评审通过修改标准版本号，每月第一天次数从1开始
 
                 //场景变更时发送信息
                 if (Objects.equals(task.getOperationSort(), "ADD_SCENE") || Objects.equals(task.getOperationSort(), "DELETE_SCENE")) {
@@ -521,6 +522,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
     public List<SysUser> getReviewList() {
         // 获取用户ID列表
         List<Long> reviewerIdList = sysUserRoleMapper.selectReviewerIdByRoleId(ReviewSceneChangeTask.REVIEW_ROLE_ID);
+        System.out.println(reviewerIdList + "========");
         // 获取用户列表
         List<SysUser> reviewerList = sysUserService.selectUserListByIds(reviewerIdList);
 

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

@@ -113,6 +113,8 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
             // 4. 修改任务状态为 SIGNED 待签字
             systemReviewTask.setTaskStatus(SystemReviewTask.STATUS_SIGNED);
 
+            // TODO setsystemReviewTask.version的值，根据任务的standardId从t_standard表查到current_version的值
+
             // 5. 设置问卷结果
             if (reviewDetailsResultMapper.findNotPass(systemReviewTask.getId()) > 0) {
                 systemReviewTask.setTaskResult("REJECT");

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

@@ -62,7 +62,6 @@
         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 sctu.role_id = 103
-        and sct.innovation_base_result = 'PASS'
         <if test="request.operationSort != null and request.operationSort != ''">
             and sct.operation_sort = #{request.operationSort}
         </if>
@@ -82,7 +81,6 @@
         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 sctu.role_id = 103
-        and sct.innovation_base_result = 'PASS'
         <if test="request.operationSort != null and request.operationSort != ''">
             and sct.operation_sort = #{request.operationSort}
         </if>
@@ -101,7 +99,7 @@
 
     <select id="findCreateListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
         SELECT * FROM t_review_scene_change_task
-        WHERE task_initiator_id = #{userId} and innovation_base_result = 'PASS'
+        WHERE task_initiator_id = #{userId}
         <if test="request.operationSort != null and request.operationSort != ''">
             and operation_sort = #{request.operationSort}
         </if>