查询待办任务列表修改&查询已办任务列表

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

@@ -20,11 +20,18 @@ public interface ReviewSceneChangeTaskMapper extends BaseMapper<ReviewSceneChang
     List<ReviewSceneChangeTask> findLastChangeByTaskId(@Param("taskId") Long taskId);
 
     /**
-     * 根据任务状态和用户ID查询列表
-     * @param taskStatus
+     * 根据用户ID查询待办列表
+     * @param userId
      * @return
      */
-    List<ReviewSceneChangeTask> findListByUserIdAndStatus(@Param("userId") Long userId, @Param("taskStatus") String taskStatus);
+    List<ReviewSceneChangeTask> findPendingListByUserId(@Param("userId") Long userId);
+
+    /**
+     * 根据用户ID查询已办列表
+     * @param userId
+     * @return
+     */
+    List<ReviewSceneChangeTask> findFinishListByUserId(@Param("userId") Long userId);
 
 }
 

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

@@ -46,11 +46,17 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange
     List<ReviewSceneChangeTask> findLastChangeByTaskId(Long taskId);
 
     /**
-     * 根据用户ID和任务状态查询列表
+     * 根据用户ID查询待办列表
      * @param userId
-     * @param taskStatus
      * @return
      */
-    List<ReviewSceneChangeTask> findListByUserIdAndStatus(Long userId, String taskStatus);
+    List<ReviewSceneChangeTask> findPendingListByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询已办列表
+     * @param userId
+     * @return
+     */
+    List<ReviewSceneChangeTask> findFinishListByUserId(Long userId);
 
 }

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

@@ -185,14 +185,24 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
     }
 
     /**
-     * 根据用户ID和任务状态查询列表
+     * 根据用户ID查询待办列表
      * @param userId
-     * @param taskStatus
      * @return
      */
     @Override
-    public List<ReviewSceneChangeTask> findListByUserIdAndStatus(Long userId, String taskStatus) {
-        List<ReviewSceneChangeTask> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findListByUserIdAndStatus(userId,taskStatus);
+    public List<ReviewSceneChangeTask> findPendingListByUserId(Long userId) {
+        List<ReviewSceneChangeTask> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findPendingListByUserId(userId);
+        return reviewSceneChangeTask;
+    }
+
+    /**
+     * 根据用户ID查询已办列表
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<ReviewSceneChangeTask> findFinishListByUserId(Long userId) {
+        List<ReviewSceneChangeTask> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findFinishListByUserId(userId);
         return reviewSceneChangeTask;
     }
 

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

@@ -39,12 +39,28 @@ public class ReviewSceneChangeTaskController extends BaseController {
         return success();
     }
 
+    /**
+     * 根据用户ID查询待办列表
+     * @return
+     */
     @Trace
-    @Log(title = "待办任务列表")
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/findPending")
     public TableDataInfo findPending() {
         startPage();
-        return getDataTable(reviewSceneChangeTaskService.findListByUserIdAndStatus(getUserId(),ReviewSceneChangeTask.STATUS_PENDING));
+        return getDataTable(reviewSceneChangeTaskService.findPendingListByUserId(getUserId()));
+    }
+
+    /**
+     * 根据用户ID查询已办列表
+     * @return
+     */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/findFinish")
+    public TableDataInfo findFinish() {
+        startPage();
+        return getDataTable(reviewSceneChangeTaskService.findFinishListByUserId(getUserId()));
     }
 
 }

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

@@ -29,10 +29,15 @@
            )
     </select>
 
-    <select id="findListByUserIdAndStatus" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
+    <select id="findPendingListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
         SELECT sct.* 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 sct.task_status = #{taskStatus}
+        WHERE sctu.user_id = #{userId} and sctu.decision IS NULL
+    </select>
+    <select id="findFinishListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
+        SELECT sct.* 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
     </select>
 
 </mapper>