导出修改

xieb

2024-01-24 24e01e7f50bbfccf880b062a9a2a91efd61055b8

 src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java

@@ -128,6 +128,20 @@
   }

   /**
    * 公司投票详情集合 分页
    * @param evaluateTaskReferrer
    * @param query
    * @return
    */
   @GetMapping("/resultList")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入evaluateTaskReferrer")
   public R<IPage<EvaluateCandidateResultVO>> resultList(EvaluateCandidateResultVO evaluateTaskReferrer, Query query) {
      IPage<EvaluateCandidateResultVO> pages = evaluateCandidateResultService.selectCandidateResultInfoPage(Condition.getPage(query), evaluateTaskReferrer);
      return R.data(pages);
   }

   /**
    * 评优任务候选人投票结果表 新增
    */
   @PostMapping("/save")
@@ -197,8 +211,9 @@
   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.groupBy("user_id");
      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<EmployeeResultGroupExcel> list = evaluateCandidateResultService.exportEmployeeResultGroupExcel(queryWrapper);
      ExcelUtil.export(response, "最终评优结果" + DateUtil.time(), "投票结果数据", list, EmployeeResultGroupExcel.class);
   }