src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskReferrerController.java
@@ -80,6 +80,12 @@ return R.data(EvaluateTaskReferrerWrapper.build().pageVO(pages)); } /** * 第一轮投票结果 * @param taskId * @param query * @return */ @GetMapping("/list/{taskId}") public R listByTaskId(@PathVariable("taskId") Long taskId, Query query) { QueryWrapper queryWrapper = new QueryWrapper(); @@ -90,6 +96,15 @@ return R.data(evaluateTaskReferrerService.pageMaps(Condition.getPage(query), queryWrapper)); } @GetMapping("/listInfo/{taskId}/{userId}") public R listInfo(@PathVariable("taskId") Long taskId,@PathVariable("userId") Long userId, Query query) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("evaluate_task_id", taskId); queryWrapper.eq("user_id", userId); IPage<EvaluateTaskReferrerEntity> evaluateTaskReferrerEntityIPage = evaluateTaskReferrerService.page(Condition.getPage(query), queryWrapper); return R.data(EvaluateTaskReferrerWrapper.build().listInfoVO(evaluateTaskReferrerEntityIPage)); } /** * 评优任务推荐人员表 自定义分页 */ src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
@@ -16,11 +16,16 @@ */ package org.springblade.modules.evaluate.wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.common.cache.SysCache; import org.springblade.common.cache.UserCache; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity; import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO; import java.util.Objects; import org.springblade.modules.system.entity.User; import java.util.*; /** * 评优任务推荐人员表 包装类,返回视图层所需的字段 @@ -46,5 +51,20 @@ return evaluateTaskReferrerVO; } public Object listInfoVO(IPage<EvaluateTaskReferrerEntity> pages) { List<EvaluateTaskReferrerEntity> list = pages.getRecords(); List<Map<String,Object>> maps = new ArrayList<>(); for (EvaluateTaskReferrerEntity po:list) { Map<String,Object> map = new HashMap<>(); User user = UserCache.getUser(po.getCreateUser());//投票人 map.put("userName", user.getName()); map.put("deptName", SysCache.getDeptName(Long.valueOf(user.getDeptId()))); map.put("postName", SysCache.getPostName(Long.valueOf(user.getPostId()))); maps.add(map); } return maps; } }