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/assessment/service/impl/AssessmentTaskServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 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 cf1d511..801ddf4 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
@@ -16,15 +16,25 @@
*/
package org.springblade.modules.assessment.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.entity.AssessmentTaskEntity;
-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.IAssessmentScoreService;
+import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
+import org.springblade.modules.assessment.service.IAssessmentSetService;
import org.springblade.modules.assessment.service.IAssessmentTaskService;
+import org.springblade.modules.assessment.vo.AssessmentTaskVO;
+import org.springblade.modules.utils.DateUtils;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.validation.constraints.NotEmpty;
import java.util.List;
/**
@@ -34,7 +44,12 @@
* @since 2023-12-07
*/
@Service
+@AllArgsConstructor
public class AssessmentTaskServiceImpl extends BaseServiceImpl<AssessmentTaskMapper, AssessmentTaskEntity> implements IAssessmentTaskService {
+
+ private final IAssessmentSetService assessmentSetService;
+ private final IAssessmentSetAssessorService assessmentSetAssessorService;
+ private final IAssessmentScoreService assessmentScoreService;
@Override
public IPage<AssessmentTaskVO> selectAssessmentTaskPage(IPage<AssessmentTaskVO> page, AssessmentTaskVO assessmentTask) {
@@ -51,4 +66,36 @@
return assessmentTaskList;
}
+ @Override
+ public boolean saveOrUpdate(AssessmentTaskEntity assessmentTask) {
+
+ if (DateUtils.isBeforeNow(assessmentTask.getStartTime())) { //如果是小于当前日期 修改状态
+ assessmentTask.setIsAssessmentOk(0);
+ }
+ return super.saveOrUpdate(assessmentTask);
+ }
+
+ @Override
+ @Transactional
+ public boolean deleteLogic(@NotEmpty List<Long> ids) {
+ boolean ret = super.deleteLogic(ids);
+ if (ret) {
+ for (Long id: ids) {
+ QueryWrapper queryWrapper = new QueryWrapper();
+ 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("assessment_set_id", po.getId());
+ assessmentSetAssessorService.remove(qw);
+ }
+ }
+
+ }
+ return ret;
+ }
+
}
--
Gitblit v1.9.3