From dd877430713d2d8a61b305cab478e11cedebbe62 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 12 Jan 2024 14:59:20 +0800
Subject: [PATCH] 评优任务编辑

---
 src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java    |    4 ++--
 src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java |    8 +++++++-
 2 files changed, 9 insertions(+), 3 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 8910c53..b96f738 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -158,8 +158,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));
 	}
 
 	/**
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..db44543 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
@@ -89,12 +89,18 @@
 
 		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