导出修改

xieb

2024-01-24 24e01e7f50bbfccf880b062a9a2a91efd61055b8

导出修改

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

@@ -213,7 +213,7 @@
        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("user_id");
        queryWrapper.groupBy("a.user_id,a.evaluate_task_category_id");
        List<EmployeeResultGroupExcel> list = evaluateCandidateResultService.exportEmployeeResultGroupExcel(queryWrapper);
        ExcelUtil.export(response, "最终评优结果" + DateUtil.time(), "投票结果数据", list, EmployeeResultGroupExcel.class);
    }

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

@@ -139,7 +139,7 @@
        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);

@@ -157,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")

 src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java

@@ -17,6 +17,7 @@
package org.springblade.modules.evaluate.wrapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springblade.common.cache.SysCache;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -73,7 +74,9 @@
            }
        }

        return maps;
        IPage<Map<String,Object>> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
        pageVo.setRecords(maps);
        return pageVo;
    }