From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复

---
 src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java |   94 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 94 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..dba1f2f 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
@@ -34,6 +34,7 @@
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
 import org.springblade.modules.evaluate.excel.EvaluateTaskReferrerExcel;
+import org.springblade.modules.evaluate.excel.ReferrerResultGroupExcel;
 import org.springblade.modules.evaluate.service.IEvaluateTaskReferrerService;
 import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO;
 import org.springblade.modules.evaluate.wrapper.EvaluateTaskReferrerWrapper;
@@ -81,6 +82,99 @@
 	}
 
 	/**
+	 * 第一轮投票详情集合 分页
+	 * @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
+	 * @return
+	 */
+	@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));
+		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));
+	}
+
+	/**
+	 * 第一轮投票结果导出数据
+	 */
+	@GetMapping("/export/{taskId}")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入evaluateTaskReferrer")
+	public void exportListByTaskId(@PathVariable("taskId") Long taskId, HttpServletResponse response) {
+		QueryWrapper queryWrapper = new QueryWrapper();
+		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,a.evaluate_task_category_id");
+
+		List<ReferrerResultGroupExcel> list = evaluateTaskReferrerService.exportListByTaskId(queryWrapper);
+
+
+		ExcelUtil.export(response, "第一轮投票结果数据数据" + DateUtil.time(), "投票结果数据", list, ReferrerResultGroupExcel.class);
+	}
+
+	@GetMapping("/listInfo/{taskId}/{userId}")
+	public R listInfo(@PathVariable("taskId") Long taskId,@PathVariable("userId") Long userId, Query query) {
+		QueryWrapper queryWrapper = new QueryWrapper();
+		queryWrapper.eq("evaluate_task_id", taskId);
+		queryWrapper.eq("user_id", userId);
+		IPage<EvaluateTaskReferrerEntity> evaluateTaskReferrerEntityIPage = evaluateTaskReferrerService.page(Condition.getPage(query), queryWrapper);
+		return R.data(EvaluateTaskReferrerWrapper.build().listInfoVO(evaluateTaskReferrerEntityIPage));
+	}
+
+	/**
+	 * 根据分类获取候选人的投票详情
+	 * @param taskId
+	 * @param evaluateTaskCategoryId
+	 * @param userId
+	 * @param query
+	 * @return
+	 */
+	@GetMapping("/listInfo/{taskId}/{evaluateTaskCategoryId}/{userId}")
+	public R listInfoByCategoryId(@PathVariable("taskId") Long taskId, @PathVariable("evaluateTaskCategoryId") Long evaluateTaskCategoryId, @PathVariable("userId") Long userId, Query query) {
+		QueryWrapper queryWrapper = new QueryWrapper();
+		queryWrapper.eq("evaluate_task_id", taskId);
+		queryWrapper.eq("user_id", userId);
+		queryWrapper.eq("evaluate_task_category_id", evaluateTaskCategoryId);
+		IPage<EvaluateTaskReferrerEntity> evaluateTaskReferrerEntityIPage = evaluateTaskReferrerService.page(Condition.getPage(query), queryWrapper);
+		return R.data(EvaluateTaskReferrerWrapper.build().listInfoVO(evaluateTaskReferrerEntityIPage));
+	}
+
+	/**
 	 * 评优任务推荐人员表 自定义分页
 	 */
 	@GetMapping("/page")

--
Gitblit v1.9.3