From 23b134e52ab20899dd8e6e75ab08352215b56409 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 15 Jan 2024 14:09:59 +0800
Subject: [PATCH] 考核删除逻辑
---
src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java | 11 +++--
src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetServiceImpl.java | 42 +++++++++++++++++++--
src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java | 20 ++++++++++
3 files changed, 65 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java b/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
index e19545f..01287e9 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
@@ -33,8 +33,11 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
+import org.springblade.modules.assessment.entity.AssessmentSetEntity;
import org.springblade.modules.assessment.excel.AssessmentSetAssessorExcel;
+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.AssessmentSetAssessorVO;
import org.springblade.modules.assessment.wrapper.AssessmentSetAssessorWrapper;
import org.springframework.web.bind.annotation.*;
@@ -58,6 +61,10 @@
public class AssessmentSetAssessorController extends BladeController {
private final IAssessmentSetAssessorService assessmentSetAssessorService;
+
+ private final IAssessmentSetService assessmentSetService;
+
+ private final IAssessmentScoreService assessmentScoreService;
/**
* 考核任务考核人 详情
@@ -125,6 +132,19 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+
+ for (Long id:Func.toLongList(ids)) {
+ AssessmentSetAssessorEntity entity = assessmentSetAssessorService.getById(id);
+ AssessmentSetEntity assessmentSet = assessmentSetService.getById(entity.getAssessmentSetId());
+
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("score_user_id", entity.getUserId());
+ queryWrapper.eq("be_id", assessmentSet.getUserId());
+ queryWrapper.eq("assessment_task_id", assessmentSet.getAssessmentTaskId());
+ assessmentScoreService.remove(queryWrapper);
+
+ }
+
return R.status(assessmentSetAssessorService.deleteLogic(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java
index 41deb6e..665eac9 100644
--- a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java
+++ b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetAssessorServiceImpl.java
@@ -16,15 +16,17 @@
*/
package org.springblade.modules.assessment.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
-import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
import org.springblade.modules.assessment.excel.AssessmentSetAssessorExcel;
import org.springblade.modules.assessment.mapper.AssessmentSetAssessorMapper;
import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
+import org.springblade.modules.assessment.vo.AssessmentSetAssessorVO;
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 java.util.List;
/**
@@ -34,6 +36,7 @@
* @since 2024-01-02
*/
@Service
+@AllArgsConstructor
public class AssessmentSetAssessorServiceImpl extends BaseServiceImpl<AssessmentSetAssessorMapper, AssessmentSetAssessorEntity> implements IAssessmentSetAssessorService {
@Override
diff --git a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetServiceImpl.java b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetServiceImpl.java
index 23d0a55..4d6e1f7 100644
--- a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetServiceImpl.java
+++ b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentSetServiceImpl.java
@@ -16,15 +16,22 @@
*/
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.vo.AssessmentSetVO;
import org.springblade.modules.assessment.excel.AssessmentSetExcel;
import org.springblade.modules.assessment.mapper.AssessmentSetMapper;
+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.AssessmentSetVO;
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 +41,12 @@
* @since 2023-12-08
*/
@Service
+@AllArgsConstructor
public class AssessmentSetServiceImpl extends BaseServiceImpl<AssessmentSetMapper, AssessmentSetEntity> implements IAssessmentSetService {
+
+ private final IAssessmentSetAssessorService assessmentSetAssessorService;
+
+ private final IAssessmentScoreService assessmentScoreService;
@Override
public IPage<AssessmentSetVO> selectAssessmentSetPage(IPage<AssessmentSetVO> page, AssessmentSetVO assessmentSet) {
@@ -51,4 +63,26 @@
return assessmentSetList;
}
+ @Override
+ @Transactional
+ public boolean deleteLogic(@NotEmpty List<Long> ids) {
+
+ for (Long id: ids) {
+
+ AssessmentSetEntity assessmentSet = getById(id);
+
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("assessment_set_id" , id);
+ assessmentSetAssessorService.remove(queryWrapper); //删除考核人表数据
+
+ //删除考核分数表
+ QueryWrapper queryWrapper1 = new QueryWrapper();
+ queryWrapper1.eq("assessment_task_id", assessmentSet.getAssessmentTaskId());
+ queryWrapper1.eq("be_id", assessmentSet.getUserId());
+ assessmentScoreService.remove(queryWrapper1);
+ }
+
+ return super.deleteLogic(ids);
+ }
+
}
--
Gitblit v1.9.3