Feat

1、改为从收件箱中查询审查任务过程中的场景变更信息。

Reference N/A

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

@@ -2,8 +2,8 @@ package com.ruoyi.mapper;
 
 import com.ruoyi.domain.ReviewSceneChangeTask;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -13,8 +13,8 @@ import java.util.List;
 * @Entity com.ruoyi.domain.ReviewSceneChangeTask
 */
 public interface ReviewSceneChangeTaskMapper extends BaseMapper<ReviewSceneChangeTask> {
+    List<ReviewSceneChangeTask> findLastChangeByTaskId(@Param("taskId") Long taskId);
 
-    List<ReviewSceneChangeTask> findLastChangeByAfterTime(Date date);
 }
 
 

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

@@ -39,10 +39,10 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange
     void close(Long taskId);
 
     /**
-     * 获取指定时间之后的每个场景的最后变更记录
-     * @param date
+     * 获取体系审查任务的每个场景的最后变更记录
+     * @param taskId
      * @return
      */
-    List<ReviewSceneChangeTask> findLastChangeByAfterTime(Date date);
+    List<ReviewSceneChangeTask> findLastChangeByTaskId(Long taskId);
 
 }

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

@@ -135,12 +135,11 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
 
     @Override
     public void close(Long taskId) {
-        ReviewSceneChangeTask task = getById(taskId);
     }
 
     @Override
-    public List<ReviewSceneChangeTask> findLastChangeByAfterTime(Date date) {
-        return reviewSceneChangeTaskMapper.findLastChangeByAfterTime(date);
+    public List<ReviewSceneChangeTask> findLastChangeByTaskId(Long taskId) {
+        return reviewSceneChangeTaskMapper.findLastChangeByTaskId(taskId);
     }
 
     private void checkTaskStatus(String status) {

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

@@ -75,7 +75,7 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
         systemReviewTask.setStandard(standardTree);
 
         // 查询场景变更任务便于提醒用户场景变动
-        List<ReviewSceneChangeTask> lastChanges = reviewSceneChangeTaskService.findLastChangeByAfterTime(systemReviewTask.getTaskBeginTime());
+        List<ReviewSceneChangeTask> lastChanges = reviewSceneChangeTaskService.findLastChangeByTaskId(systemReviewTask.getId());
 
         // 构建返回结果
         SystemReviewTaskViewResponse response = new SystemReviewTaskViewResponse();

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

@@ -22,10 +22,10 @@
             <result property="taskEndTime" column="task_end_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
-    <select id="findLastChangeByAfterTime" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
+    <select id="findLastChangeByTaskId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
         SELECT * FROM t_review_scene_change_task WHERE id IN
            (
-                   SELECT MAX(id) FROM t_review_scene_change_task WHERE task_status = 'FINISH' AND task_result = 'PASS' AND task_end_time >= #{date} GROUP BY review_scene_id
+               SELECT MAX(id) FROM t_review_scene_change_task WHERE task_status = 'FINISH' AND task_result = 'PASS' AND id IN (SELECT review_scene_change_task_id FROM t_system_review_task_inbox WHERE system_review_task_id = 1737668929502830594 AND is_confirm = 0) GROUP BY review_scene_id
            )
     </select>