From f4131eb88e31addc72f5a55606d6060c42a0b3f6 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 05 Jan 2024 15:26:09 +0800
Subject: [PATCH] 评优任务修改
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 54 +++++++++++++++++++-----------------------------------
1 files changed, 19 insertions(+), 35 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 be86334..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,51 +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.entity.EvaluateResultEntity;
+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.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.*;
-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 java.util.Set;
-import java.util.stream.Collectors;
+
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
@@ -69,9 +59,6 @@
public class EvaluateTaskController extends BladeController {
private final IEvaluateTaskService evaluateTaskService;
- private final IUserService userService;
-
- private final IEvaluateResultService evaluateResultService;
/**
* 评优任务表 详情
@@ -94,9 +81,6 @@
return R.data(EvaluateTaskWrapper.build().pageVO(pages));
}
-
-
-
/**
* 评优任务表 自定义分页
*/
@@ -114,8 +98,8 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入evaluateTask")
- public R save(@Valid @RequestBody EvaluateTaskVO vo) {
- return R.status(evaluateTaskService.save(vo));
+ public R save(@Valid @RequestBody EvaluateTaskDTO dto) {
+ return R.status(evaluateTaskService.saveTaskAndCategory(dto));
}
/**
@@ -124,8 +108,8 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入evaluateTask")
- public R update(@Valid @RequestBody EvaluateTaskVO vo) {
- return R.status(evaluateTaskService.updateById(vo));
+ public R update(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
+ return R.status(evaluateTaskService.updateById(evaluateTask));
}
/**
--
Gitblit v1.9.3