From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 71a5876..443f0b7 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -33,7 +33,6 @@
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;
@@ -109,10 +108,13 @@
QueryWrapper queryWrapper = new QueryWrapper();
if (null != evaluateTask.getType())
queryWrapper.eq("type", evaluateTask.getType());
+ if (null != evaluateTask.getEvaluateState())
+ queryWrapper.eq("evaluate_state", evaluateTask.getEvaluateState());
User user = userService.getById(AuthUtil.getUser().getUserId());
queryWrapper.like("polling_persons" , user.getEmployeeType());
+ queryWrapper.like("JSON_EXTRACT(vote_person_obj_info, '$[*].participateIn')", user.getId());
IPage<EvaluateTaskEntity> pages = evaluateTaskService.page(Condition.getPage(query), queryWrapper);
- return R.data(EvaluateTaskWrapper.build().pageVO(pages));
+ return R.data(EvaluateTaskWrapper.build().h5CandidatePageVO(pages));
}
/**
@@ -124,11 +126,22 @@
@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));
+ }
+
+ /**
+ * 员工列表 不分页
+ * @param user
+ * @return
+ */
+ @GetMapping("/userListBy")
+ @ApiOperation(value = "分页", notes = "传入user")
+ public R<List<UserVO>> userListBy(User user) {
+ QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user);
+ List<User> list = userService.list(queryWrapper);
+ return R.data(UserWrapper.build().listVO(list));
}
/**
@@ -149,7 +162,8 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入evaluateTask")
public R save(@Valid @RequestBody EvaluateTaskDTO dto) {
- return R.status(evaluateTaskService.saveTaskAndCategory(dto));
+ evaluateTaskService.saveTaskAndCategory(dto);
+ return R.data(dto);
}
/**
@@ -158,8 +172,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));
}
/**
@@ -169,7 +183,8 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入evaluateTask")
public R submit(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
- if (DateUtils.isToday(evaluateTask.getEvaluateCutoffTimeStart())) {//是否今天开始
+ // 如果是小于当前日期 修改状态
+ if (null != evaluateTask.getEvaluateCutoffTimeStart() && DateUtils.isBeforeNow(evaluateTask.getEvaluateCutoffTimeStart())) {
evaluateTask.setEvaluateState(1);
}
return R.status(evaluateTaskService.saveOrUpdate(evaluateTask));
--
Gitblit v1.9.3