From aeaf528b601b754bd5893b6142f06302701d6dab Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 23 Jan 2024 11:31:51 +0800
Subject: [PATCH] 公司评优导出修改
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java | 2 +-
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml | 2 +-
src/main/java/org/springblade/modules/evaluate/excel/EmployeeResultGroupExcel.java | 18 ++++++------------
3 files changed, 8 insertions(+), 14 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 3ba0780..22ddb25 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
@@ -211,7 +211,7 @@
public void exprotEmployeeResultGroupExcel(@PathVariable("taskId") Long taskId, HttpServletResponse response) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("a.evaluate_task_id", taskId);
- queryWrapper.orderByDesc("b.id,voteNUm");
+ queryWrapper.orderByDesc("a.evaluate_task_category_id,a.dept_id,voteNum");
queryWrapper.groupBy("user_id");
List<EmployeeResultGroupExcel> list = evaluateCandidateResultService.exportEmployeeResultGroupExcel(queryWrapper);
ExcelUtil.export(response, "最终评优结果" + DateUtil.time(), "投票结果数据", list, EmployeeResultGroupExcel.class);
diff --git a/src/main/java/org/springblade/modules/evaluate/excel/EmployeeResultGroupExcel.java b/src/main/java/org/springblade/modules/evaluate/excel/EmployeeResultGroupExcel.java
index 42f5be6..c8aca66 100644
--- a/src/main/java/org/springblade/modules/evaluate/excel/EmployeeResultGroupExcel.java
+++ b/src/main/java/org/springblade/modules/evaluate/excel/EmployeeResultGroupExcel.java
@@ -41,18 +41,18 @@
private static final long serialVersionUID = 1L;
/**
- * 姓名
+ * 奖项
*/
@ColumnWidth(20)
- @ExcelProperty("类别名称")
+ @ExcelProperty("奖项")
private String categoryName;
/**
- * 认定标准
+ * 部门
*/
- @ColumnWidth(100)
- @ExcelProperty("认定标准")
- private String standard;
+ @ColumnWidth(20)
+ @ExcelProperty("部门")
+ private String deptName;
/**
* 姓名
@@ -61,12 +61,6 @@
@ExcelProperty("姓名")
private String userName;
- /**
- * 部门
- */
- @ColumnWidth(20)
- @ExcelProperty("部门")
- private String deptName;
/**
* 职位
*/
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 02eb673..20554d2 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml
@@ -60,7 +60,7 @@
</select>
<select id="exportEmployeeResultGroupExcel" resultType="org.springblade.modules.evaluate.excel.EmployeeResultGroupExcel">
- select b.category_name,b.standard,a.user_name,a.dept_name,a.post_name,count(*) voteNum from yw_evaluate_candidate_result a
+ select b.category_name,a.user_name,a.dept_name,a.post_name,count(*) voteNum from yw_evaluate_candidate_result a
LEFT JOIN yw_evaluate_task_category b ON (a.evaluate_task_category_id = b.id)
${ew.customSqlSegment}
--
Gitblit v1.9.3