From 243fd893c84bd0b379b94efa8a6242b0adc6a6eb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 04 Jan 2024 15:30:00 +0800
Subject: [PATCH] 考核任务

---
 src/main/java/org/springblade/modules/assessment/service/impl/AssessmentTaskServiceImpl.java |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentTaskServiceImpl.java b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentTaskServiceImpl.java
index a8793dd..8e2d97a 100644
--- a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentTaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentTaskServiceImpl.java
@@ -18,15 +18,15 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
+import org.springblade.modules.assessment.entity.AssessmentSetEntity;
 import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
+import org.springblade.modules.assessment.service.IAssessmentScoreService;
+import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
+import org.springblade.modules.assessment.service.IAssessmentSetService;
 import org.springblade.modules.assessment.vo.AssessmentTaskVO;
 import org.springblade.modules.assessment.excel.AssessmentTaskExcel;
 import org.springblade.modules.assessment.mapper.AssessmentTaskMapper;
 import org.springblade.modules.assessment.service.IAssessmentTaskService;
-import org.springblade.modules.evaluate.entity.EvaluateCandidateEntity;
-import org.springblade.modules.evaluate.service.IEvaluateCandidateAssessorService;
-import org.springblade.modules.evaluate.service.IEvaluateCandidateService;
-import org.springblade.modules.evaluate.service.IEvaluateTaskSetService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,7 +34,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.constraints.NotEmpty;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -47,9 +46,9 @@
 @AllArgsConstructor
 public class AssessmentTaskServiceImpl extends BaseServiceImpl<AssessmentTaskMapper, AssessmentTaskEntity> implements IAssessmentTaskService {
 
-	private final IEvaluateCandidateService evaluateCandidateService;
-	private final IEvaluateTaskSetService evaluateTaskSetService;
-	private final IEvaluateCandidateAssessorService evaluateCandidateAssessorService;
+	private final IAssessmentSetService assessmentSetService;
+	private final IAssessmentSetAssessorService assessmentSetAssessorService;
+	private final IAssessmentScoreService assessmentScoreService;
 
 	@Override
 	public IPage<AssessmentTaskVO> selectAssessmentTaskPage(IPage<AssessmentTaskVO> page, AssessmentTaskVO assessmentTask) {
@@ -73,15 +72,15 @@
 		if (ret) {
 			for (Long id: ids) {
 				QueryWrapper queryWrapper = new QueryWrapper();
-				queryWrapper.eq("evaluate_task_id", id);
-				List<EvaluateCandidateEntity> list = evaluateCandidateService.list(queryWrapper);
-				evaluateCandidateService.remove(queryWrapper);
-				evaluateTaskSetService.remove(queryWrapper);
-				for (EvaluateCandidateEntity po: list
+				queryWrapper.eq("assessment_task_id", id);
+				List<AssessmentSetEntity> list = assessmentSetService.list(queryWrapper);
+				assessmentSetService.remove(queryWrapper);
+				assessmentScoreService.remove(queryWrapper);
+				for (AssessmentSetEntity po: list
 					 ) {
 					QueryWrapper qw = new QueryWrapper();
-					qw.eq("evaluate_candidate_id", po.getId());
-					evaluateCandidateAssessorService.remove(qw);
+					qw.eq("assessment_set_id", po.getId());
+					assessmentSetAssessorService.remove(qw);
 				}
 			}
 

--
Gitblit v1.9.3