修复

xieb

2025-01-21 bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21

 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,8 +137,9 @@
   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");
      queryWrapper.groupBy("a.user_id,a.evaluate_task_category_id");

      List<ReferrerResultGroupExcel> list = evaluateTaskReferrerService.exportListByTaskId(queryWrapper);

@@ -142,6 +157,24 @@
   }

   /**
    * 根据分类获取候选人的投票详情
    * @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")