From 1dca355eb004bf15df3ef88bc7d290e98e5f6e05 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 15 Jan 2024 15:34:31 +0800
Subject: [PATCH] 1

---
 src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java |   68 +++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 2 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..cfd721f 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -28,6 +28,7 @@
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
@@ -38,6 +39,11 @@
 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.springblade.modules.utils.DateUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -59,6 +65,7 @@
 public class EvaluateTaskController extends BladeController {
 
 	private final IEvaluateTaskService evaluateTaskService;
+	private final IUserService userService;
 
 	/**
 	 * 评优任务表 详情
@@ -79,6 +86,60 @@
 	public R<IPage<EvaluateTaskVO>> list(@ApiIgnore @RequestParam Map<String, Object> evaluateTask, Query query) {
 		IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(evaluateTask, EvaluateTaskEntity.class));
 		return R.data(EvaluateTaskWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 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().h5ReferremPageVO(pages));
+	}
+	@GetMapping("/taskListByPolling")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入evaluateTask")
+	public R<IPage<EvaluateTaskVO>> taskListByPolling(EvaluateTaskEntity evaluateTask, Query query) {
+		QueryWrapper queryWrapper = new QueryWrapper();
+		if (null != evaluateTask.getType())
+			queryWrapper.eq("type", evaluateTask.getType());
+		User user = userService.getById(AuthUtil.getUser().getUserId());
+		queryWrapper.like("polling_persons" , user.getEmployeeType());
+		IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), queryWrapper);
+		return R.data(EvaluateTaskWrapper.build().h5CandidatePageVO(pages));
+	}
+
+	/**
+	 * 根据部门id获取用户列表
+	 * @param query 分页
+	 * @param user 用户参数
+	 * @return
+	 */
+	@GetMapping("/userList")
+	@ApiOperation(value = "分页", notes = "传入user")
+	public R<IPage<UserVO>> userList(Query query,User user) {
+		QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user);
+		IPage<User> pages = userService.page(Condition.getPage(query), queryWrapper);
+		return R.data(UserWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 员工列表 不分页
+	 * @param query
+	 * @param user
+	 * @return
+	 */
+	@GetMapping("/userListBy")
+	@ApiOperation(value = "分页", notes = "传入user")
+	public R<List<UserVO>> userListBy(Query query,User user) {
+		QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user);
+		List<User> list = userService.list(Condition.getPage(query), queryWrapper);
+		return R.data(UserWrapper.build().listVO(list));
 	}
 
 	/**
@@ -108,8 +169,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 EvaluateTaskDTO evaluateTask) {
+		return R.status(evaluateTaskService.updateTaskAndCategory(evaluateTask));
 	}
 
 	/**
@@ -119,6 +180,9 @@
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入evaluateTask")
 	public R submit(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
+		if (DateUtils.isToday(evaluateTask.getEvaluateCutoffTimeStart())) {//是否今天开始
+			evaluateTask.setEvaluateState(1);
+		}
 		return R.status(evaluateTaskService.saveOrUpdate(evaluateTask));
 	}
 

--
Gitblit v1.9.3