From e4595b7277e9f08ab000cc21d19edc5af3de2463 Mon Sep 17 00:00:00 2001 From: "YOHO\\20373" <2037305722@qq.com> Date: Fri, 30 May 2025 01:41:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=81=E5=88=A0=E9=99=A4=E5=88=A4=E6=96=AD=E8=AF=95?= =?UTF-8?q?=E5=8D=B7=E7=A7=8D=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paper/EducationPaperSchemeController.java | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperSchemeController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperSchemeController.java index 58bfdf62..0728e85d 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperSchemeController.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperSchemeController.java @@ -4,8 +4,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import pc.exam.pp.framework.common.pojo.CommonResult; import pc.exam.pp.module.exam.dal.dataobject.EducationPaperScheme; +import pc.exam.pp.module.exam.dal.dataobject.EducationPaperTask; import pc.exam.pp.module.exam.service.paper.IEducationPaperSchemeService; import pc.exam.pp.module.exam.service.paper.IEducationPaperService; +import pc.exam.pp.module.exam.service.paper.IEducationPaperTaskService; import java.util.List; @@ -24,8 +26,10 @@ public class EducationPaperSchemeController { @Autowired private IEducationPaperSchemeService educationPaperSchemeService; -@Autowired -private IEducationPaperService educationPaperService; + @Autowired + private IEducationPaperService educationPaperService; + @Autowired + private IEducationPaperTaskService educationPaperTaskService; /** * 查询试卷方案列表 */ @@ -63,10 +67,17 @@ private IEducationPaperService educationPaperService; public CommonResult add(@RequestBody EducationPaperScheme educationPaperScheme) { - List strings = educationPaperService.selectPaperByTaskId(educationPaperScheme.getTaskId()); - if (strings!=null&&strings.size()>0){ - return CommonResult.error(DEMO03_PAPER_TASK_ADD_EXISTS); + + EducationPaperTask educationPaperTask = educationPaperTaskService.selectEducationPaperTaskByTaskId(educationPaperScheme.getTaskId()); + String taskType = educationPaperTask.getTaskType(); + if ( "0".equals(taskType)||"1".equals(taskType)||"3".equals(taskType)) { + List strings = educationPaperService.selectPaperByTaskId(educationPaperScheme.getTaskId()); + if (strings!=null&&strings.size()>0){ + return CommonResult.error(DEMO03_PAPER_TASK_ADD_EXISTS); + } } + + return CommonResult.success(educationPaperSchemeService.insertEducationPaperScheme(educationPaperScheme)); } @@ -86,10 +97,17 @@ private IEducationPaperService educationPaperService; public CommonResult remove(@PathVariable String schemeIds) { EducationPaperScheme educationPaperScheme = educationPaperSchemeService.selectEducationPaperSchemeBySchemeId(schemeIds); - List strings = educationPaperService.selectPaperByTaskId(educationPaperScheme.getTaskId()); - if (strings!=null&&strings.size()>0){ - return CommonResult.error(DEMO03_PAPER_TASK_DEL_EXISTS); + + EducationPaperTask educationPaperTask = educationPaperTaskService.selectEducationPaperTaskByTaskId(educationPaperScheme.getTaskId()); + String taskType = educationPaperTask.getTaskType(); + if ( "0".equals(taskType)||"1".equals(taskType)||"3".equals(taskType)){ + List strings = educationPaperService.selectPaperByTaskId(educationPaperScheme.getTaskId()); + if (strings!=null&&strings.size()>0){ + return CommonResult.error(DEMO03_PAPER_TASK_DEL_EXISTS); + } } + + return CommonResult.success(educationPaperSchemeService.deleteEducationPaperSchemeBySchemeId(schemeIds)); } }