From a56ae8cf1ccbd4f1965875b38f54c186c12812f2 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 06 Jan 2024 16:58:44 +0800
Subject: [PATCH] 第一轮评优结果查询
---
src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskReferrerEntity.java | 6 ++++++
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml | 1 +
src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java | 2 ++
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java | 10 ++++++++++
4 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
index 188dc45..f8ef010 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
@@ -80,6 +80,16 @@
return R.data(EvaluateTaskReferrerWrapper.build().pageVO(pages));
}
+ @GetMapping("/list/{taskId}")
+ public R listByTaskId(@PathVariable("taskId") Long taskId, Query query) {
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.select("*, count(*) as voteNum");
+ queryWrapper.eq("evaluate_task_id", taskId);
+ queryWrapper.orderByDesc("dept_name,count(*)");
+ queryWrapper.groupBy("user_id");
+ return R.data(evaluateTaskReferrerService.pageMaps(Condition.getPage(query), queryWrapper));
+ }
+
/**
* 评优任务推荐人员表 自定义分页
*/
diff --git a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskReferrerEntity.java b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskReferrerEntity.java
index 4003d70..20856f0 100644
--- a/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskReferrerEntity.java
+++ b/src/main/java/org/springblade/modules/evaluate/entity/EvaluateTaskReferrerEntity.java
@@ -66,4 +66,10 @@
@ApiModelProperty(value = "被推荐人员职位名称")
private String postName;
+ /**
+ * 推荐理由
+ */
+ @ApiModelProperty(value = "推荐理由")
+ private String remark;
+
}
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
index b429044..22393cf 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
@@ -12,6 +12,7 @@
<result column="dept_id" property="deptId"/>
<result column="dept_name" property="deptName"/>
<result column="post_name" property="postName"/>
+ <result column="remark" property="remark"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
<result column="create_time" property="createTime"/>
diff --git a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java
index ddad840..07a80b6 100644
--- a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java
+++ b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java
@@ -31,4 +31,6 @@
public class EvaluateTaskReferrerVO extends EvaluateTaskReferrerEntity {
private static final long serialVersionUID = 1L;
+ private Integer voteNum;//票数
+
}
--
Gitblit v1.9.3