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 | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 82b2d36..443f0b7 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -108,6 +108,8 @@
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());
@@ -131,15 +133,14 @@
/**
* 员工列表 不分页
- * @param query
* @param user
* @return
*/
@GetMapping("/userListBy")
@ApiOperation(value = "分页", notes = "传入user")
- public R<List<UserVO>> userListBy(Query query,User user) {
+ public R<List<UserVO>> userListBy(User user) {
QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user);
- List<User> list = userService.list(Condition.getPage(query), queryWrapper);
+ List<User> list = userService.list(queryWrapper);
return R.data(UserWrapper.build().listVO(list));
}
@@ -161,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);
}
/**
@@ -181,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