From 754dcc774b41c43c7a8798edf5efa382b05474fd Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 09 Jan 2024 10:52:14 +0800
Subject: [PATCH] 公司评优、部门评优
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 1be31fe..8910c53 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -44,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;
@@ -111,7 +112,7 @@
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().pageVO(pages));
+ return R.data(EvaluateTaskWrapper.build().h5CandidatePageVO(pages));
}
/**
@@ -168,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