src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -108,6 +108,8 @@ QueryWrapper queryWrapper = new QueryWrapper(); if (null != evaluateTask.getType()) queryWrapper.eq("type", evaluateTask.getType()); if (null != evaluateTask.getEvaluateState()) queryWrapper.eq("evaluate_state", evaluateTask.getEvaluateState()); User user = userService.getById(AuthUtil.getUser().getUserId()); queryWrapper.like("polling_persons" , user.getEmployeeType()); queryWrapper.like("JSON_EXTRACT(vote_person_obj_info, '$[*].participateIn')", user.getId()); 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; @@ -123,13 +122,9 @@ @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); queryWrapper.eq("a.evaluate_task_id", taskId); queryWrapper.orderByDesc("a.evaluate_task_category_id,a.dept_id,voteNum"); queryWrapper.groupBy("a.user_id"); List<ReferrerResultGroupExcel> list = evaluateTaskReferrerService.exportListByTaskId(queryWrapper); src/main/java/org/springblade/modules/evaluate/excel/ReferrerResultGroupExcel.java
@@ -41,11 +41,11 @@ private static final long serialVersionUID = 1L; /** * 姓名 * 部门 */ @ColumnWidth(20) @ExcelProperty("姓名") private String userName; @ExcelProperty("奖项") private String categoryName; /** * 部门 @@ -53,6 +53,14 @@ @ColumnWidth(20) @ExcelProperty("部门") private String deptName; /** * 姓名 */ @ColumnWidth(20) @ExcelProperty("姓名") private String userName; /** * 职位 */ src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
@@ -87,7 +87,9 @@ </select> <select id="exportListByTaskId" resultType="org.springblade.modules.evaluate.excel.ReferrerResultGroupExcel"> SELECT *, count(*) as voteNum FROM yw_evaluate_task_referrer ${ew.customSqlSegment} SELECT b.category_name,a.dept_name,a.user_name,a.post_name, count(*) as voteNum FROM yw_evaluate_task_referrer a LEFT JOIN yw_evaluate_task_category b on (evaluate_task_category_id = b.id) ${ew.customSqlSegment} </select> </mapper>