From 6b7dc24c6d2afddfe4ef7dddc896bc9222b4d528 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 08 Jan 2024 11:28:17 +0800
Subject: [PATCH] 注释
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 3759786..72edb91 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -32,12 +32,17 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
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.evaluate.wrapper.EvaluateTaskWrapper;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserVO;
+import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -59,6 +64,7 @@
public class EvaluateTaskController extends BladeController {
private final IEvaluateTaskService evaluateTaskService;
+ private final IUserService userService;
/**
* 评优任务表 详情
@@ -82,6 +88,36 @@
}
/**
+ * H5使用-评优任务列表
+ * @param evaluateTask
+ * @param query
+ * @return 返回自己是否投票和投票集合
+ */
+ @GetMapping("/selfList")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入evaluateTask")
+ public R<IPage<EvaluateTaskVO>> selfList(EvaluateTaskEntity evaluateTask, Query query) {
+ IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(evaluateTask));
+ return R.data(EvaluateTaskWrapper.build().h5PageVO(pages));
+ }
+
+ /**
+ * 根据部门id获取用户列表
+ * @param query 分页
+ * @param user 用户参数
+ * @return
+ */
+ @GetMapping("/userList")
+ @ApiOperation(value = "分页", notes = "传入user")
+ public R<IPage<UserVO>> userList(Query query,User user) {
+ if (StringUtil.isBlank(user.getDeptId()))
+ return R.fail(-1,"部门id不能为空");
+ QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user);
+ IPage<User> pages = userService.page(Condition.getPage(query), queryWrapper);
+ return R.data(UserWrapper.build().pageVO(pages));
+ }
+
+ /**
* 评优任务表 自定义分页
*/
@GetMapping("/page")
--
Gitblit v1.9.3