From a4baf57cb433dfcee1c58a7d9d3f96f34ffbd697 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 11 Jan 2024 11:31:52 +0800
Subject: [PATCH] 用户手机号码查询
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 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 c1eff80..8910c53 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;
@@ -43,6 +44,7 @@
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;
@@ -85,6 +87,32 @@
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));
}
/**
@@ -141,6 +169,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