From a8e4e63745dd53ff923e5704c06676f296e9e1ab Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 29 Dec 2023 17:16:27 +0800
Subject: [PATCH] h5根据登录用户获取评优任务
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 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 b665f32..4d31d2d 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -94,6 +94,25 @@
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
+ * @param query
+ * @return
+ */
@GetMapping("/taskList/{deptId}/{userId}")
public R taskList(@ApiIgnore @PathVariable Long deptId,@ApiIgnore @PathVariable Long userId, Query query) {
QueryWrapper<EvaluateTaskEntity> wrapper = new QueryWrapper<>();
@@ -176,8 +195,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 +205,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