From dd9d2221feef02b06d7e398183c81d3912322d38 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 12 Jan 2024 14:31:02 +0800
Subject: [PATCH] 最终投票列表详情
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java | 14 ++++++++++++++
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.java | 1 +
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml | 25 +++++++++++++++++++++++++
src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateResultService.java | 1 +
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateResultServiceImpl.java | 4 ++++
src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateResultVO.java | 4 ++++
6 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
index 6e59a7e..3ba0780 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
@@ -128,6 +128,20 @@
}
/**
+ * 公司投票详情集合 分页
+ * @param evaluateTaskReferrer
+ * @param query
+ * @return
+ */
+ @GetMapping("/resultList")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入evaluateTaskReferrer")
+ public R<IPage<EvaluateCandidateResultVO>> resultList(EvaluateCandidateResultVO evaluateTaskReferrer, Query query) {
+ IPage<EvaluateCandidateResultVO> pages = evaluateCandidateResultService.selectCandidateResultInfoPage(Condition.getPage(query), evaluateTaskReferrer);
+ return R.data(pages);
+ }
+
+ /**
* 评优任务候选人投票结果表 新增
*/
@PostMapping("/save")
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.java b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.java
index 6ce10d6..8e1e9e2 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.java
@@ -44,6 +44,7 @@
*/
List<EvaluateCandidateResultVO> selectEvaluateCandidateResultPage(IPage page, EvaluateCandidateResultVO evaluateCandidateResult);
+ List<EvaluateCandidateResultVO> selectCandidateResultInfoPage(IPage page, EvaluateCandidateResultVO evaluateCandidateResult);
/**
* 获取导出数据
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml
index 83cd7e9..07c12e4 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml
@@ -28,6 +28,31 @@
select * from yw_evaluate_candidate_result where is_deleted = 0
</select>
+ <select id="selectCandidateResultInfoPage" resultType="org.springblade.modules.evaluate.vo.EvaluateCandidateResultVO">
+ select a.*,b.`name` as voteUserName,c.dept_name AS voteDeptName,d.post_name AS votePostName from
+ (select * from yw_evaluate_candidate_result where is_deleted = 0 ) a
+ LEFT JOIN blade_user b ON (a.create_user = b.id)
+ LEFT JOIN blade_dept c ON (b.dept_id = c.id)
+ LEFT JOIN blade_post d ON (b.post_id = d.id)
+ <where>
+ <if test="evaluateCandidateResult.type != null and evaluateCandidateResult.type != ''">
+ and a.type = #{evaluateCandidateResult.type}
+ </if>
+ <if test="evaluateCandidateResult.evaluateTaskId != null and evaluateCandidateResult.evaluateTaskId != ''">
+ and a.evaluate_task_id = #{evaluateCandidateResult.evaluateTaskId}
+ </if>
+ <if test="evaluateCandidateResult.userName != null and evaluateCandidateResult.userName != ''">
+ and a.user_name like concat('%', #{evaluateCandidateResult.userName}, '%')
+ </if>
+ <if test="evaluateCandidateResult.deptName != null and evaluateCandidateResult.deptName != ''">
+ and a.dept_name like concat('%', #{evaluateCandidateResult.deptName}, '%')
+ </if>
+ <if test="evaluateCandidateResult.voteUserName != null and evaluateCandidateResult.voteUserName != ''">
+ and b.name like concat('%', #{evaluateCandidateResult.voteUserName}, '%')
+ </if>
+ </where>
+ </select>
+
<select id="exportEvaluateCandidateResult" resultType="org.springblade.modules.evaluate.excel.EvaluateCandidateResultExcel">
SELECT * FROM yw_evaluate_candidate_result ${ew.customSqlSegment}
diff --git a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateResultService.java b/src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateResultService.java
index f84cfa5..36975ec 100644
--- a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateResultService.java
+++ b/src/main/java/org/springblade/modules/evaluate/service/IEvaluateCandidateResultService.java
@@ -43,6 +43,7 @@
*/
IPage<EvaluateCandidateResultVO> selectEvaluateCandidateResultPage(IPage<EvaluateCandidateResultVO> page, EvaluateCandidateResultVO evaluateCandidateResult);
+ IPage<EvaluateCandidateResultVO> selectCandidateResultInfoPage(IPage<EvaluateCandidateResultVO> page, EvaluateCandidateResultVO evaluateCandidateResult);
/**
* 导出数据
diff --git a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateResultServiceImpl.java b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateResultServiceImpl.java
index e096d42..c25ead2 100644
--- a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateResultServiceImpl.java
+++ b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateCandidateResultServiceImpl.java
@@ -43,6 +43,10 @@
return page.setRecords(baseMapper.selectEvaluateCandidateResultPage(page, evaluateCandidateResult));
}
+ @Override
+ public IPage<EvaluateCandidateResultVO> selectCandidateResultInfoPage(IPage<EvaluateCandidateResultVO> page, EvaluateCandidateResultVO evaluateCandidateResult) {
+ return page.setRecords(baseMapper.selectCandidateResultInfoPage(page, evaluateCandidateResult));
+ }
@Override
public List<EvaluateCandidateResultExcel> exportEvaluateCandidateResult(Wrapper<EvaluateCandidateResultEntity> queryWrapper) {
diff --git a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateResultVO.java b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateResultVO.java
index 56bf90d..9597daf 100644
--- a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateResultVO.java
+++ b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateCandidateResultVO.java
@@ -31,4 +31,8 @@
public class EvaluateCandidateResultVO extends EvaluateCandidateResultEntity {
private static final long serialVersionUID = 1L;
+ private String voteUserName;//投票人名称
+ private String voteDeptName;//投票人部门名称
+ private String votePostName;//投票人职位名称
+
}
--
Gitblit v1.9.3