Merge branch 'wangdingyi' into 'dev'

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

See merge request !8

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

@@ -113,6 +113,11 @@ public class ReviewSceneChangeTask {
      */
     private String taskInitiatorDept;
 
+    /**
+     * 任务发起人Id
+     */
+    private Long taskInitiatorId;
+
     /**
      * 任务状态（PENDING、FINISH、CLOSE）
      */
@@ -145,4 +150,4 @@ public class ReviewSceneChangeTask {
      */
     private Long reviewSceneId;
 
-}
+}
\ No newline at end of file

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

@@ -19,6 +19,27 @@ import java.util.List;
 public interface ReviewSceneChangeTaskMapper extends BaseMapper<ReviewSceneChangeTask> {
     List<ReviewSceneChangeTask> findLastChangeByTaskId(@Param("taskId") Long taskId);
 
+    /**
+     * 根据用户ID查询待办列表
+     * @param userId
+     * @return
+     */
+    List<ReviewSceneChangeTask> findPendingListByUserId(@Param("userId") Long userId);
+
+    /**
+     * 根据用户ID查询已办列表
+     * @param userId
+     * @return
+     */
+    List<ReviewSceneChangeTask> findFinishListByUserId(@Param("userId") Long userId);
+
+    /**
+     * 查询当前用户创建的任务
+     * @param userId
+     * @return
+     */
+    List<ReviewSceneChangeTask> findCreateListByUserId(@Param("userId") Long userId);
+
 }
 
 

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

@@ -45,4 +45,25 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange
      */
     List<ReviewSceneChangeTask> findLastChangeByTaskId(Long taskId);
 
+    /**
+     * 根据用户ID查询待办列表
+     * @param userId
+     * @return
+     */
+    List<ReviewSceneChangeTask> findPendingListByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询已办列表
+     * @param userId
+     * @return
+     */
+    List<ReviewSceneChangeTask> findFinishListByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询发布的任务列表
+     * @param userId
+     * @return
+     */
+    List<ReviewSceneChangeTask> findCreateListByUserId(Long userId);
+
 }

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

@@ -58,6 +58,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
         reviewSceneChangeTask
                 .setTaskInitiator(loginUser.getNickName())
                 .setTaskInitiatorDept(loginUser.getDept().getDeptName())
+                .setTaskInitiatorId(loginUser.getUserId())
                 .setTaskStatus(ReviewSceneChangeTask.STATUS_PENDING)
                 .setTaskBeginTime(new Date());
 
@@ -184,6 +185,39 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
         return true;
     }
 
+    /**
+     * 根据用户ID查询待办列表
+     * @param userId
+     * @return
+     */
+    @Override
+    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;
+    }
+
+    /**
+     * 根据用户ID查询已办列表
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<ReviewSceneChangeTask> findCreateListByUserId(Long userId) {
+        List<ReviewSceneChangeTask> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findCreateListByUserId(userId);
+        return reviewSceneChangeTask;
+    }
+
 }
 
 

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

@@ -3,6 +3,7 @@ package com.ruoyi.web;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.domain.ReviewSceneChangeTask;
@@ -38,4 +39,40 @@ public class ReviewSceneChangeTaskController extends BaseController {
         return success();
     }
 
+    /**
+     * 根据用户ID查询待办列表
+     * @return
+     */
+    @Trace
+    @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.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()));
+    }
+
+    /**
+     * 查询当前用户发布的任务
+     * @return
+     */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/findCreate")
+    public TableDataInfo findCreate() {
+        startPage();
+        return getDataTable(reviewSceneChangeTaskService.findCreateListByUserId(getUserId()));
+    }
+
 }

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

@@ -29,4 +29,21 @@
            )
     </select>
 
+    <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 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>
+
+    <select id="findCreateListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
+        SELECT * FROM t_review_scene_change_task
+        WHERE task_initiator_id = #{userId}
+    </select>
+
 </mapper>