xieb
2024-01-11 567775c8ef9761b5fe5d04073ca329b7ef30e22d
src/main/java/org/springblade/modules/evaluate/controller/EvaluateCandidateResultController.java
@@ -84,20 +84,31 @@
      return R.data(EvaluateCandidateResultWrapper.build().pageVO(pages));
   }
   /**
    * 公司投票和部门投票根据用户或者部门汇总
    * @param evaluateCandidateResult
    * @param query
    * @return
    */
   @GetMapping("/listByCategoryId")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入evaluateCandidateResult")
   public R listByCategoryId(EvaluateCandidateResultEntity evaluateCandidateResult,Query query) {
      QueryWrapper queryWrapper = new QueryWrapper();
      queryWrapper.eq("evaluate_task_category_id", evaluateCandidateResult.getEvaluateTaskCategoryId());
      queryWrapper.select("*,count(*) voteNum");
      EvaluateTaskEntity taskEntity = evaluateTaskService.getById(evaluateCandidateResult.getEvaluateTaskId());
      if (taskEntity.getType() == 0) {
         queryWrapper.eq("evaluate_task_category_id", evaluateCandidateResult.getEvaluateTaskCategoryId());
         queryWrapper.groupBy("user_id");
      } else {
         queryWrapper.groupBy("dept_id");
      }
      if (null != evaluateCandidateResult.getEvaluateTaskId())
         queryWrapper.eq("evaluate_task_id", evaluateCandidateResult.getEvaluateTaskId());
      queryWrapper.select("*,count(*) voteNum");
      queryWrapper.orderByDesc("count(*)");
      return R.data(evaluateCandidateResultService.pageMaps(Condition.getPage(query), queryWrapper));