From 243fd893c84bd0b379b94efa8a6242b0adc6a6eb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 04 Jan 2024 15:30:00 +0800
Subject: [PATCH] 考核任务
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 70 ++---------------------------------
1 files changed, 4 insertions(+), 66 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 b665f32..be86334 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -94,70 +94,8 @@
return R.data(EvaluateTaskWrapper.build().pageVO(pages));
}
- @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) {
- 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)));
- }
- }
-
- }
- IPage<EvaluateTaskVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
- pageVo.setRecords(records);
-
- return R.data(pageVo);
- }
/**
* 评优任务表 自定义分页
@@ -176,8 +114,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));
}
/**
@@ -186,8 +124,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