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/controller/AssessmentSetAssessorController.java | 73 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 32 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 0694adb..01287e9 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentSetAssessorController.java
@@ -16,34 +16,37 @@
*/
package org.springblade.modules.assessment.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-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.wrapper.AssessmentSetAssessorWrapper;
-import org.springblade.modules.assessment.service.IAssessmentSetAssessorService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
+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.*;
import springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
+
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
/**
* 考核任务考核人 控制器
@@ -58,6 +61,10 @@
public class AssessmentSetAssessorController extends BladeController {
private final IAssessmentSetAssessorService assessmentSetAssessorService;
+
+ private final IAssessmentSetService assessmentSetService;
+
+ private final IAssessmentScoreService assessmentScoreService;
/**
* 考核任务考核人 详情
@@ -83,20 +90,9 @@
@GetMapping("/listByAssessor")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "h5任务列表-分页", notes = "传入evaluateCandidateAssessor")
- public R<IPage<AssessmentSetAssessorVO>> listByAssessor(@ApiIgnore @RequestParam Map<String, Object> assessmentSetAssessor, Query query) {;
- IPage<AssessmentSetAssessorEntity> pages = assessmentSetAssessorService.page(Condition.getPage(query), Condition.getQueryWrapper(assessmentSetAssessor, AssessmentSetAssessorEntity.class));
- return R.data(AssessmentSetAssessorWrapper.build().h5PageVO(pages, Long.valueOf(assessmentSetAssessor.get("userId").toString())));
- }
-
- /**
- * 考核任务考核人 自定义分页
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入assessmentSetAssessor")
- public R<IPage<AssessmentSetAssessorVO>> page(AssessmentSetAssessorVO assessmentSetAssessor, Query query) {
- IPage<AssessmentSetAssessorVO> pages = assessmentSetAssessorService.selectAssessmentSetAssessorPage(Condition.getPage(query), assessmentSetAssessor);
- return R.data(pages);
+ public R<IPage<AssessmentSetAssessorVO>> listByAssessor(AssessmentSetAssessorVO assessmentSetAssessor, Query query) {;
+ IPage<AssessmentSetAssessorEntity> pages = assessmentSetAssessorService.selectAssessmentSetAssessorPage(Condition.getPage(query), assessmentSetAssessor);
+ return R.data(AssessmentSetAssessorWrapper.build().h5PageVO(pages, Long.valueOf(assessmentSetAssessor.getUserId())));
}
/**
@@ -136,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)));
}
--
Gitblit v1.9.3