From ffaa6ca7eab630bf64f66e687f835dcd57f39f1a Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 04 Jan 2024 09:04:38 +0800
Subject: [PATCH] 查询考核列表异常
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 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 3fc3598..9d392ac 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -94,19 +94,7 @@
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
@@ -195,8 +183,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));
}
/**
@@ -205,8 +193,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