From f2cbc4caf044245e340c12046a02a927eb9bcd0f Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 08 Jan 2024 15:01:49 +0800
Subject: [PATCH] 根据类别id获取获选人列表
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 2 +-
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskCategoryCandidateController.java | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskCategoryCandidateController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskCategoryCandidateController.java
index b21cb9e..2fd37cd 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskCategoryCandidateController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskCategoryCandidateController.java
@@ -91,6 +91,17 @@
return R.data(pages);
}
+ @GetMapping("/listByCategoryId")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入evaluateTaskCategoryCandidate")
+ public R h5listByCategoryId(EvaluateTaskCategoryCandidateVO evaluateTaskCategoryCandidate) {
+ if (null == evaluateTaskCategoryCandidate.getEvaluateTaskCategoryId())
+ return R.fail(-1,"任务类型id不能为空");
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("evaluate_task_category_id", evaluateTaskCategoryCandidate.getEvaluateTaskCategoryId());
+ return R.data(evaluateTaskCategoryCandidateService.list(queryWrapper));
+ }
+
/**
* 评优任务任务类别候选人表 新增
*/
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
index e43dfd1..1be31fe 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -107,7 +107,7 @@
public R<IPage<EvaluateTaskVO>> taskListByPolling(EvaluateTaskEntity evaluateTask, Query query) {
QueryWrapper queryWrapper = new QueryWrapper();
if (null != evaluateTask.getType())
- queryWrapper.eq("", evaluateTask.getType());
+ queryWrapper.eq("type", evaluateTask.getType());
User user = userService.getById(AuthUtil.getUser().getUserId());
queryWrapper.like("polling_persons" , user.getEmployeeType());
IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), queryWrapper);
--
Gitblit v1.9.3