From 567775c8ef9761b5fe5d04073ca329b7ef30e22d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 11 Jan 2024 16:00:14 +0800
Subject: [PATCH] 第一轮结果导出
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 97 +++++++++++++++++++++++++++++++++---------------
1 files changed, 67 insertions(+), 30 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 be86334..8910c53 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -16,51 +16,48 @@
*/
package org.springblade.modules.evaluate.controller;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
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;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.assessment.wrapper.CandidateJsonObj;
-import org.springblade.modules.evaluate.entity.EvaluateResultEntity;
+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.IEvaluateResultService;
import org.springblade.modules.evaluate.service.IEvaluateTaskService;
import org.springblade.modules.evaluate.vo.EvaluateTaskVO;
-import org.springblade.modules.evaluate.wrapper.EvaluateResultWrapper;
+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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.evaluate.wrapper.EvaluateTaskWrapper;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
import springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
+
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
/**
* 评优任务表 控制器
*
* @author aix
- * @since 2023-12-08
+ * @since 2024-01-05
*/
@RestController
@AllArgsConstructor
@@ -70,8 +67,6 @@
private final IEvaluateTaskService evaluateTaskService;
private final IUserService userService;
-
- private final IEvaluateResultService evaluateResultService;
/**
* 评优任务表 详情
@@ -94,8 +89,47 @@
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) {
+ 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));
+ }
/**
* 评优任务表 自定义分页
@@ -114,8 +148,8 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入evaluateTask")
- public R save(@Valid @RequestBody EvaluateTaskVO vo) {
- return R.status(evaluateTaskService.save(vo));
+ public R save(@Valid @RequestBody EvaluateTaskDTO dto) {
+ return R.status(evaluateTaskService.saveTaskAndCategory(dto));
}
/**
@@ -124,8 +158,8 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入evaluateTask")
- public R update(@Valid @RequestBody EvaluateTaskVO vo) {
- return R.status(evaluateTaskService.updateById(vo));
+ public R update(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
+ return R.status(evaluateTaskService.updateById(evaluateTask));
}
/**
@@ -135,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