|
@@ -350,12 +350,15 @@ public class WmTaskTypeController {
|
|
* @return 列表数据
|
|
* @return 列表数据
|
|
*/
|
|
*/
|
|
@GetMapping("/list-package-task-type")
|
|
@GetMapping("/list-package-task-type")
|
|
- public R<?> listPackageTaskType(@RequestParam(value = "scorePackageId") String scorePackageId) {
|
|
|
|
|
|
+ public R<?> listPackageTaskType(@RequestParam(value = "scorePackageId") String scorePackageId, String taskStatus) {
|
|
// 获取待审核的任务
|
|
// 获取待审核的任务
|
|
- List<WmTask> wmTasks = wmTaskMapper.selectList(Wrappers.<WmTask>lambdaQuery()
|
|
|
|
|
|
+ LambdaQueryWrapper<WmTask> queryWrapper = Wrappers.<WmTask>lambdaQuery()
|
|
.select(WmTask::getTaskTypeId)
|
|
.select(WmTask::getTaskTypeId)
|
|
- .eq(WmTask::getScorePackageId, scorePackageId)
|
|
|
|
- .eq(WmTask::getTaskStatus, TaskStatusEnum.UNDER_REVIEW.val()));
|
|
|
|
|
|
+ .eq(WmTask::getScorePackageId, scorePackageId);
|
|
|
|
+ if (StrUtil.isNotBlank(taskStatus)) {
|
|
|
|
+ queryWrapper.eq(WmTask::getTaskStatus, taskStatus);
|
|
|
|
+ }
|
|
|
|
+ List<WmTask> wmTasks = wmTaskMapper.selectList(queryWrapper);
|
|
if (CollUtil.isEmpty(wmTasks)) {
|
|
if (CollUtil.isEmpty(wmTasks)) {
|
|
return R.ok(Collections.emptyList());
|
|
return R.ok(Collections.emptyList());
|
|
}
|
|
}
|