From 5a979967f3321c87d5ba8ff7fa768cfc648ed3fc Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 05 Jan 2024 16:35:38 +0800
Subject: [PATCH] 评优任务投票推荐人
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 70 ++++++++--------------------------
1 files changed, 17 insertions(+), 53 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..3759786 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -16,46 +16,41 @@
*/
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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.assessment.wrapper.CandidateJsonObj;
+import org.springblade.modules.evaluate.dto.EvaluateTaskDTO;
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;
import org.springblade.modules.evaluate.wrapper.EvaluateTaskWrapper;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
+import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
+
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
/**
* 评优任务表 控制器
*
* @author aix
- * @since 2023-12-08
+ * @since 2024-01-05
*/
@RestController
@AllArgsConstructor
@@ -64,7 +59,6 @@
public class EvaluateTaskController extends BladeController {
private final IEvaluateTaskService evaluateTaskService;
- private final IUserService userService;
/**
* 评优任务表 详情
@@ -87,36 +81,6 @@
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);
-
- // 处理获取当前部门的用户
- 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);
- }
-
/**
* 评优任务表 自定义分页
*/
@@ -134,8 +98,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 EvaluateTaskDTO dto) {
+ return R.status(evaluateTaskService.saveTaskAndCategory(dto));
}
/**
--
Gitblit v1.9.3