Commit 6ddef5b9 authored by W_Y's avatar W_Y

查询当前用户发起的任务

parent 580d203c
...@@ -113,6 +113,11 @@ public class ReviewSceneChangeTask { ...@@ -113,6 +113,11 @@ public class ReviewSceneChangeTask {
*/ */
private String taskInitiatorDept; private String taskInitiatorDept;
/**
* 任务发起人Id
*/
private Long taskInitiatorId;
/** /**
* 任务状态(PENDING、FINISH、CLOSE) * 任务状态(PENDING、FINISH、CLOSE)
*/ */
...@@ -145,4 +150,4 @@ public class ReviewSceneChangeTask { ...@@ -145,4 +150,4 @@ public class ReviewSceneChangeTask {
*/ */
private Long reviewSceneId; private Long reviewSceneId;
} }
\ No newline at end of file
...@@ -33,6 +33,13 @@ public interface ReviewSceneChangeTaskMapper extends BaseMapper<ReviewSceneChang ...@@ -33,6 +33,13 @@ public interface ReviewSceneChangeTaskMapper extends BaseMapper<ReviewSceneChang
*/ */
List<ReviewSceneChangeTask> findFinishListByUserId(@Param("userId") Long userId); List<ReviewSceneChangeTask> findFinishListByUserId(@Param("userId") Long userId);
/**
* 查询当前用户创建的任务
* @param userId
* @return
*/
List<ReviewSceneChangeTask> findCreateListByUserId(@Param("userId") Long userId);
} }
......
...@@ -59,4 +59,11 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange ...@@ -59,4 +59,11 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange
*/ */
List<ReviewSceneChangeTask> findFinishListByUserId(Long userId); List<ReviewSceneChangeTask> findFinishListByUserId(Long userId);
/**
* 根据用户ID查询发布的任务列表
* @param userId
* @return
*/
List<ReviewSceneChangeTask> findCreateListByUserId(Long userId);
} }
...@@ -58,6 +58,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha ...@@ -58,6 +58,7 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
reviewSceneChangeTask reviewSceneChangeTask
.setTaskInitiator(loginUser.getNickName()) .setTaskInitiator(loginUser.getNickName())
.setTaskInitiatorDept(loginUser.getDept().getDeptName()) .setTaskInitiatorDept(loginUser.getDept().getDeptName())
.setTaskInitiatorId(loginUser.getUserId())
.setTaskStatus(ReviewSceneChangeTask.STATUS_PENDING) .setTaskStatus(ReviewSceneChangeTask.STATUS_PENDING)
.setTaskBeginTime(new Date()); .setTaskBeginTime(new Date());
...@@ -206,6 +207,17 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha ...@@ -206,6 +207,17 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
return reviewSceneChangeTask; return reviewSceneChangeTask;
} }
/**
* 根据用户ID查询已办列表
* @param userId
* @return
*/
@Override
public List<ReviewSceneChangeTask> findCreateListByUserId(Long userId) {
List<ReviewSceneChangeTask> reviewSceneChangeTask = reviewSceneChangeTaskMapper.findCreateListByUserId(userId);
return reviewSceneChangeTask;
}
} }
......
...@@ -63,4 +63,16 @@ public class ReviewSceneChangeTaskController extends BaseController { ...@@ -63,4 +63,16 @@ public class ReviewSceneChangeTaskController extends BaseController {
return getDataTable(reviewSceneChangeTaskService.findFinishListByUserId(getUserId())); 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()));
}
} }
...@@ -34,10 +34,16 @@ ...@@ -34,10 +34,16 @@
LEFT JOIN t_review_scene_change_task_user_relation sctu ON sct.id = sctu.task_id 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 WHERE sctu.user_id = #{userId} and sctu.decision IS NULL
</select> </select>
<select id="findFinishListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask"> <select id="findFinishListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
SELECT sct.* FROM t_review_scene_change_task sct 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 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 WHERE sctu.user_id = #{userId} and sctu.decision IS NOT NULL
</select> </select>
<select id="findCreateListByUserId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
SELECT * FROM t_review_scene_change_task
WHERE task_initiator_id = #{userId}
</select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment