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/service/impl/EvaluateTaskServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java
index 13a9c41..1847a1b 100644
--- a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java
@@ -63,7 +63,7 @@
 	@Transactional
 	public Boolean saveTaskAndCategory(EvaluateTaskDTO dto) {
 
-		if (DateUtils.isToday(dto.getCandidateCutoffTimeStart())) {//是否今天开始
+		if (DateUtils.isBeforeNow(dto.getCandidateCutoffTimeStart())) {// 如果是小于当前日期 修改状态
 			dto.setCandidateState(1);
 		}
 
@@ -83,18 +83,24 @@
 	@Transactional
 	public Boolean updateTaskAndCategory(EvaluateTaskDTO dto) {
 
-		if (DateUtils.isToday(dto.getCandidateCutoffTimeStart())) {//是否今天开始
+		if (DateUtils.isBeforeNow(dto.getCandidateCutoffTimeStart())) {//如果是小于当前日期 修改状态
 			dto.setCandidateState(1);
 		}
 
 		boolean ret = updateById(dto);
 		if (ret) {
+
+			//先删除
+			QueryWrapper queryWrapper = new QueryWrapper();
+			queryWrapper.eq("evaluate_task_id", dto.getId());
+			evaluateTaskCategoryService.remove(queryWrapper);
+
 			List<EvaluateTaskCategoryEntity> evaluateTaskCategoryEntityList = dto.getCategoryEntities().stream().map(categoryEntity -> {
 					categoryEntity.setEvaluateTaskId(dto.getId());  // 给每个categoryEntity对象的EvaluateTaskId属性设置新值
 					return categoryEntity;  // 返回修改后的对象
 				})
 				.collect(Collectors.toList());
-			evaluateTaskCategoryService.updateBatchById(evaluateTaskCategoryEntityList);
+			evaluateTaskCategoryService.saveOrUpdateBatch(evaluateTaskCategoryEntityList);
 		}
 		return ret;
 	}

--
Gitblit v1.9.3