From 08480c7fbef16c9e04ed7c2de77cc6640bd98e7c Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 11 Jan 2024 16:44:48 +0800
Subject: [PATCH] 第一轮结果导出

---
 src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml             |    4 ++++
 src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java            |    3 +++
 src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskReferrerServiceImpl.java |    6 ++++++
 src/main/java/org/springblade/modules/evaluate/excel/ReferrerResultGroupExcel.java               |    2 +-
 src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java         |    3 +++
 src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java    |    9 ++++++---
 6 files changed, 23 insertions(+), 4 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 c13eb2e..6bb32c5 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
@@ -106,15 +106,18 @@
 	@ApiOperation(value = "导出数据", notes = "传入evaluateTaskReferrer")
 	public void exportListByTaskId(@PathVariable("taskId") Long taskId, HttpServletResponse response) {
 		QueryWrapper queryWrapper = new QueryWrapper();
-		queryWrapper.select("*, count(*) as voteNum");
+//		queryWrapper.select("*, count(*) as voteNum");
 		queryWrapper.eq("evaluate_task_id", taskId);
 		queryWrapper.orderByDesc("dept_name,count(*)");
 		queryWrapper.groupBy("user_id");
 		Page page = new Page();
 		page.setSize(1);
 		page.setCurrent(9999);
-		IPage pages = evaluateTaskReferrerService.pageMaps(page, queryWrapper);
-		ExcelUtil.export(response, "第一轮投票结果数据数据" + DateUtil.time(), "投票结果数据", page.getRecords(), ReferrerResultGroupExcel.class);
+
+		List<ReferrerResultGroupExcel> list = evaluateTaskReferrerService.exportListByTaskId(queryWrapper);
+
+
+		ExcelUtil.export(response, "第一轮投票结果数据数据" + DateUtil.time(), "投票结果数据", list, ReferrerResultGroupExcel.class);
 	}
 
 	@GetMapping("/listInfo/{taskId}/{userId}")
diff --git a/src/main/java/org/springblade/modules/evaluate/excel/ReferrerResultGroupExcel.java b/src/main/java/org/springblade/modules/evaluate/excel/ReferrerResultGroupExcel.java
index fe47573..0672d7a 100644
--- a/src/main/java/org/springblade/modules/evaluate/excel/ReferrerResultGroupExcel.java
+++ b/src/main/java/org/springblade/modules/evaluate/excel/ReferrerResultGroupExcel.java
@@ -65,7 +65,7 @@
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("票数")
-	private String viteNum;
+	private String voteNum;
 
 
 }
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 f1f8665..76113c4 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.java
@@ -17,6 +17,7 @@
 package org.springblade.modules.evaluate.mapper;
 
 import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
+import org.springblade.modules.evaluate.excel.ReferrerResultGroupExcel;
 import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO;
 import org.springblade.modules.evaluate.excel.EvaluateTaskReferrerExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -51,4 +52,6 @@
 	 */
 	List<EvaluateTaskReferrerExcel> exportEvaluateTaskReferrer(@Param("ew") Wrapper<EvaluateTaskReferrerEntity> queryWrapper);
 
+	List<ReferrerResultGroupExcel> exportListByTaskId(@Param("ew") Wrapper<ReferrerResultGroupExcel> queryWrapper);
+
 }
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 22393cf..7d831af 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
@@ -32,4 +32,8 @@
         SELECT * FROM yw_evaluate_task_referrer ${ew.customSqlSegment}
     </select>
 
+    <select id="exportListByTaskId" resultType="org.springblade.modules.evaluate.excel.ReferrerResultGroupExcel">
+        SELECT *, count(*) as voteNum FROM yw_evaluate_task_referrer ${ew.customSqlSegment}
+    </select>
+
 </mapper>
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 f7c0b9b..a783f45 100644
--- a/src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java
+++ b/src/main/java/org/springblade/modules/evaluate/service/IEvaluateTaskReferrerService.java
@@ -18,6 +18,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
+import org.springblade.modules.evaluate.excel.ReferrerResultGroupExcel;
 import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO;
 import org.springblade.modules.evaluate.excel.EvaluateTaskReferrerExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,4 +50,6 @@
 	 */
 	List<EvaluateTaskReferrerExcel> exportEvaluateTaskReferrer(Wrapper<EvaluateTaskReferrerEntity> queryWrapper);
 
+	List<ReferrerResultGroupExcel> exportListByTaskId(Wrapper<ReferrerResultGroupExcel> queryWrapper);
+
 }
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 51a2bd4..a91057c 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
@@ -17,6 +17,7 @@
 package org.springblade.modules.evaluate.service.impl;
 
 import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
+import org.springblade.modules.evaluate.excel.ReferrerResultGroupExcel;
 import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO;
 import org.springblade.modules.evaluate.excel.EvaluateTaskReferrerExcel;
 import org.springblade.modules.evaluate.mapper.EvaluateTaskReferrerMapper;
@@ -51,4 +52,9 @@
 		return evaluateTaskReferrerList;
 	}
 
+	@Override
+	public List<ReferrerResultGroupExcel> exportListByTaskId(Wrapper<ReferrerResultGroupExcel> queryWrapper) {
+		List<ReferrerResultGroupExcel> evaluateTaskReferrerList = baseMapper.exportListByTaskId(queryWrapper);
+		return evaluateTaskReferrerList;
+	}
 }

--
Gitblit v1.9.3