From 22f49b3542c69c933435df3378e1b9dbdddd8650 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 20 Jan 2024 17:20:58 +0800
Subject: [PATCH] 状态判断修改
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 21a8e68..d2ea221 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -160,7 +160,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);
}
/**
@@ -180,7 +181,8 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入evaluateTask")
public R submit(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
- if (null != evaluateTask.getEvaluateCutoffTimeStart() && 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