From 7d9a8592d8cc64830acbfd357285f378556cd8be Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 12 Jan 2024 13:38:44 +0800
Subject: [PATCH] 第一轮投票列表
---
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml | 18 ++++++++++++++++++
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java | 8 ++++++++
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java | 4 ++++
src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java | 4 ++++
src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java | 8 ++++++++
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java | 14 ++++++++++++++
6 files changed, 56 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 6bb32c5..6af1ffc 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
@@ -83,6 +83,20 @@
}
/**
+ * 第一轮投票详情集合 分页
+ * @param evaluateTaskReferrer
+ * @param query
+ * @return
+ */
+ @GetMapping("/referrerList")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入evaluateTaskReferrer")
+ public R<IPage<EvaluateTaskReferrerVO>> referrerList(EvaluateTaskReferrerVO evaluateTaskReferrer, Query query) {
+ IPage<EvaluateTaskReferrerVO> pages = evaluateTaskReferrerService.selectReferrerInfoPage(Condition.getPage(query), evaluateTaskReferrer);
+ return R.data(pages);
+ }
+
+ /**
* 第一轮投票结果
* @param taskId
* @param query
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java
index 76113c4..d3fcc41 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java
@@ -43,6 +43,14 @@
*/
List<EvaluateTaskReferrerVO> selectEvaluateTaskReferrerPage(IPage page, EvaluateTaskReferrerVO evaluateTaskReferrer);
+ /**
+ * 投票详情集合 分页
+ * @param page
+ * @param evaluateTaskReferrer
+ * @return
+ */
+ List<EvaluateTaskReferrerVO> selectReferrerInfoPage(IPage page, EvaluateTaskReferrerVO evaluateTaskReferrer);
+
/**
* 获取导出数据
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 7d831af..9906f12 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
@@ -27,6 +27,24 @@
select * from yw_evaluate_task_referrer where is_deleted = 0
</select>
+ <select id="selectReferrerInfoPage" resultType="org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO">
+ SELECT a.*,b.`name` as voteUserName,c.dept_name AS voteDeptName,d.post_name AS votePostName from (select * from yw_evaluate_task_referrer 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="evaluateTaskReferrer.evaluateTaskId != null and evaluateTaskReferrer.evaluateTaskId != ''">
+ and a.evaluate_task_id = #{evaluateTaskReferrer.evaluateTaskId}
+ </if>
+ <if test="evaluateTaskReferrer.userName != null and evaluateTaskReferrer.userName != ''">
+ and a.user_name like concat('%', #{evaluateTaskReferrer.userName}, '%')
+ </if>
+ <if test="evaluateTaskReferrer.voteUserName != null and evaluateTaskReferrer.voteUserName != ''">
+ and b.name like concat('%', #{evaluateTaskReferrer.voteUserName}, '%')
+ </if>
+ </where>
+ </select>
+
<select id="exportEvaluateTaskReferrer" resultType="org.springblade.modules.evaluate.excel.EvaluateTaskReferrerExcel">
SELECT * FROM yw_evaluate_task_referrer ${ew.customSqlSegment}
diff --git a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java b/src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java
index a783f45..b151a15 100644
--- a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java
+++ b/src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java
@@ -41,6 +41,14 @@
*/
IPage<EvaluateTaskReferrerVO> selectEvaluateTaskReferrerPage(IPage<EvaluateTaskReferrerVO> page, EvaluateTaskReferrerVO evaluateTaskReferrer);
+ /**
+ * 投票详情集合 分页
+ * @param page
+ * @param evaluateTaskReferrer
+ * @return
+ */
+ IPage<EvaluateTaskReferrerVO> selectReferrerInfoPage(IPage<EvaluateTaskReferrerVO> page, EvaluateTaskReferrerVO evaluateTaskReferrer);
+
/**
* 导出数据
diff --git a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java
index a91057c..38f411c 100644
--- a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java
+++ b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java
@@ -42,6 +42,10 @@
return page.setRecords(baseMapper.selectEvaluateTaskReferrerPage(page, evaluateTaskReferrer));
}
+ @Override
+ public IPage<EvaluateTaskReferrerVO> selectReferrerInfoPage(IPage<EvaluateTaskReferrerVO> page, EvaluateTaskReferrerVO evaluateTaskReferrer) {
+ return page.setRecords(baseMapper.selectReferrerInfoPage(page, evaluateTaskReferrer));
+ }
@Override
public List<EvaluateTaskReferrerExcel> exportEvaluateTaskReferrer(Wrapper<EvaluateTaskReferrerEntity> queryWrapper) {
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 07a80b6..72c5a02 100644
--- a/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java
+++ b/src/main/java/org/springblade/modules/evaluate/vo/EvaluateTaskReferrerVO.java
@@ -33,4 +33,8 @@
private Integer voteNum;//票数
+ private String voteUserName;//投票人名称
+ private String voteDeptName;//投票人部门名称
+ private String votePostName;//投票人职位名称
+
}
--
Gitblit v1.9.3