导出修改

xieb

2024-01-23 e4ffdd005b01ca7cc54e335a813bc07b62216ad9

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

@@ -114,6 +114,20 @@
      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));
   }

   /**
    * 第一轮投票结果导出数据
    */
@@ -123,6 +137,7 @@
   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");