From 3d88793efc19e5c8dc4700edff4ccbbbec9dbd01 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 18 Dec 2023 11:13:13 +0800
Subject: [PATCH] 当前部门候选人
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
index 43d767b..daca43a 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -16,6 +16,9 @@
*/
package org.springblade.modules.evaluate.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -28,10 +31,13 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.assessment.wrapper.CandidateJsonObj;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.excel.EvaluateTaskExcel;
import org.springblade.modules.evaluate.service.IEvaluateTaskService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -58,6 +64,7 @@
public class EvaluateTaskController extends BladeController {
private final IEvaluateTaskService evaluateTaskService;
+ private final IUserService userService;
/**
* 评优任务表 详情
@@ -81,11 +88,33 @@
}
@GetMapping("/taskList/{deptId}/{userId}")
- public R taskList(@ApiIgnore @PathVariable Long deptId,@ApiIgnore @PathVariable Long userId) {
+ public R taskList(@ApiIgnore @PathVariable Long deptId,@ApiIgnore @PathVariable Long userId, Query query) {
QueryWrapper<EvaluateTaskEntity> wrapper = new QueryWrapper<>();
wrapper.or().like("candidate_num",deptId).or().like("candidate_num",userId);
- List<EvaluateTaskEntity> list = evaluateTaskService.list(wrapper);
- return R.data(EvaluateTaskWrapper.build().listVO(list));
+ IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), wrapper);
+
+ // 处理获取当前部门的用户
+ List<EvaluateTaskVO> records = EvaluateTaskWrapper.build().listVO(pages.getRecords());
+ for (EvaluateTaskVO vo: records) {
+ List<CandidateJsonObj> candidateJsonObjs = JSONArray.parseArray(JSON.toJSONString(vo.getCandidateNum()),CandidateJsonObj.class);
+ for (CandidateJsonObj obj:candidateJsonObjs) {
+ if (deptId.equals(obj.getDeptId()) && obj.getUsers().size() > 0) {
+ vo.setSelfCandidate(obj.getUsers());
+ break;
+ } else if(deptId.equals(obj.getDeptId()) && obj.getUsers().size() == 0) {
+ QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
+ userQueryWrapper.like("dept_id", deptId);
+ List<User> users = userService.list(userQueryWrapper);
+ vo.setSelfCandidate(users);
+ break;
+ }
+ }
+
+ }
+ IPage<EvaluateTaskVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
+ pageVo.setRecords(records);
+
+ return R.data(pageVo);
}
/**
--
Gitblit v1.9.3