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 | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 d8f209b..be86334 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,16 @@
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.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.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -43,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;
/**
@@ -58,6 +69,9 @@
public class EvaluateTaskController extends BladeController {
private final IEvaluateTaskService evaluateTaskService;
+ private final IUserService userService;
+
+ private final IEvaluateResultService evaluateResultService;
/**
* 评优任务表 详情
@@ -80,6 +94,9 @@
return R.data(EvaluateTaskWrapper.build().pageVO(pages));
}
+
+
+
/**
* 评优任务表 自定义分页
*/
@@ -97,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));
}
/**
@@ -107,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