From e4ffdd005b01ca7cc54e335a813bc07b62216ad9 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 23 Jan 2024 14:15:56 +0800
Subject: [PATCH] 导出修改
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java | 62 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 16 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..99fa029 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
@@ -18,7 +18,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -83,6 +82,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
@@ -90,12 +103,29 @@
*/
@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));
+// 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));
+ EvaluateTaskReferrerVO evaluateTaskReferrerVO = new EvaluateTaskReferrerVO();
+ evaluateTaskReferrerVO.setEvaluateTaskId(taskId);
+ return R.data(evaluateTaskReferrerService.selectEvaluateTaskReferrerMapPage(Condition.getPage(query), evaluateTaskReferrerVO));
+ }
+
+ @GetMapping("/list/{taskId}/{evaluateTaskCategoryId}")
+ public R listByTaskIdAndCategoryId(@PathVariable("taskId") Long taskId, @PathVariable("evaluateTaskCategoryId") Long evaluateTaskCategoryId, 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));
+ EvaluateTaskReferrerVO evaluateTaskReferrerVO = new EvaluateTaskReferrerVO();
+ evaluateTaskReferrerVO.setEvaluateTaskId(taskId);
+ evaluateTaskReferrerVO.setEvaluateTaskCategoryId(evaluateTaskCategoryId);
+ return R.data(evaluateTaskReferrerService.selectEvaluateTaskReferrerMapPage(Condition.getPage(query), evaluateTaskReferrerVO));
}
/**
@@ -106,15 +136,15 @@
@ApiOperation(value = "导出数据", notes = "传入evaluateTaskReferrer")
public void exportListByTaskId(@PathVariable("taskId") Long taskId, HttpServletResponse response) {
QueryWrapper queryWrapper = new QueryWrapper();
- 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);
+ queryWrapper.eq("a.evaluate_task_id", taskId);
+ queryWrapper.eq("a.is_deleted", 0);
+ queryWrapper.orderByDesc("a.evaluate_task_category_id,a.dept_id,voteNum");
+ queryWrapper.groupBy("a.user_id");
+
+ List<ReferrerResultGroupExcel> list = evaluateTaskReferrerService.exportListByTaskId(queryWrapper);
+
+
+ ExcelUtil.export(response, "第一轮投票结果数据数据" + DateUtil.time(), "投票结果数据", list, ReferrerResultGroupExcel.class);
}
@GetMapping("/listInfo/{taskId}/{userId}")
--
Gitblit v1.9.3