From a8e4e63745dd53ff923e5704c06676f296e9e1ab Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 29 Dec 2023 17:16:27 +0800
Subject: [PATCH] h5根据登录用户获取评优任务
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 93 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 77 insertions(+), 16 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 daca43a..4d31d2d 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -32,10 +32,13 @@
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.EvaluateResultEntity;
import org.springblade.modules.evaluate.entity.EvaluateTaskEntity;
import org.springblade.modules.evaluate.excel.EvaluateTaskExcel;
+import org.springblade.modules.evaluate.service.IEvaluateResultService;
import org.springblade.modules.evaluate.service.IEvaluateTaskService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
+import org.springblade.modules.evaluate.wrapper.EvaluateResultWrapper;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
@@ -49,6 +52,8 @@
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
/**
@@ -65,6 +70,8 @@
private final IEvaluateTaskService evaluateTaskService;
private final IUserService userService;
+
+ private final IEvaluateResultService evaluateResultService;
/**
* 评优任务表 详情
@@ -87,26 +94,80 @@
return R.data(EvaluateTaskWrapper.build().pageVO(pages));
}
+ /**
+ * 公司评优
+ * @param userId
+ * @param query
+ * @return
+ */
+ @GetMapping("/companyList/{userId}")
+ public R companyList(@ApiIgnore @PathVariable Long userId, Query query) {
+ QueryWrapper<EvaluateTaskEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("evaluate_state",1).eq("type", 0);
+ IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), wrapper);
+ return R.data(EvaluateTaskWrapper.build().companyListPageVO(pages,userId));
+ }
+ /**
+ * 个人评优
+ * @param userId
+ * @param query
+ * @return
+ */
@GetMapping("/taskList/{deptId}/{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);
IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), wrapper);
- // 处理获取当前部门的用户
+ // 处理获取当前部门的用户 type为0时
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;
+ if (vo.getType() == 0) {
+ List<CandidateJsonObj> candidateJsonObjs = JSONArray.parseArray(JSON.toJSONString(vo.getCandidateNum()),CandidateJsonObj.class);
+ QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
+ userQueryWrapper.like("dept_id", deptId);
+ List<User> users = userService.list(userQueryWrapper);
+
+ for (CandidateJsonObj obj:candidateJsonObjs) {
+ if (deptId.equals(obj.getDeptId()) && obj.getUsers().size() > 0) {
+
+ //处理自己部门用户
+ List<Object> commonItems = obj.getUsers().stream()
+ .filter(item1 -> users.stream()
+ .anyMatch(item2 -> item1.getId().equals(item2.getId())))
+ .collect(Collectors.toList());
+
+ vo.setSelfCandidate(commonItems);
+
+ break;
+ } else if(deptId.equals(obj.getDeptId()) && obj.getUsers().size() == 0) {
+
+ vo.setSelfCandidate(users);
+ break;
+ }
+ }
+
+ //是否评论完成
+ QueryWrapper<EvaluateResultEntity> resultEntityQueryWrapper = new QueryWrapper<>();
+ resultEntityQueryWrapper.eq("score_user_id", userId);
+ resultEntityQueryWrapper.eq("type", 0);
+ resultEntityQueryWrapper.eq("evaluate_task_id", vo.getId());
+ long reqCount = evaluateResultService.count(resultEntityQueryWrapper);
+ vo.setIsEvaluateOk(reqCount > 0);
+ if (reqCount > 0) {
+ vo.setEvaluateResultVO(EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(resultEntityQueryWrapper)));
+ }
+
+ } else {
+ //是否评论完成
+ QueryWrapper<EvaluateResultEntity> resultEntityQueryWrapper = new QueryWrapper<>();
+ resultEntityQueryWrapper.eq("score_user_id", userId);
+ resultEntityQueryWrapper.eq("type", 1);
+ resultEntityQueryWrapper.eq("evaluate_task_id", vo.getId());
+ long reqCount = evaluateResultService.count(resultEntityQueryWrapper);
+ vo.setIsEvaluateOk(reqCount > 0);
+ if (reqCount > 0) {
+ vo.setEvaluateResultVO(EvaluateResultWrapper.build().entityVO(evaluateResultService.getOne(resultEntityQueryWrapper)));
}
}
@@ -134,8 +195,8 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入evaluateTask")
- public R save(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
- return R.status(evaluateTaskService.save(evaluateTask));
+ public R save(@Valid @RequestBody EvaluateTaskVO vo) {
+ return R.status(evaluateTaskService.save(vo));
}
/**
@@ -144,8 +205,8 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入evaluateTask")
- public R update(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
- return R.status(evaluateTaskService.updateById(evaluateTask));
+ public R update(@Valid @RequestBody EvaluateTaskVO vo) {
+ return R.status(evaluateTaskService.updateById(vo));
}
/**
--
Gitblit v1.9.3