From ddebcfaf85cbb400668f38b1efd82e439c6e1012 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 08:39:43 +0800
Subject: [PATCH] 报名考试接口修改

---
 src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
index 2b69dd5..1673428 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -34,6 +34,8 @@
 import org.springblade.modules.exam.vo.ExamPaperVO;
 import org.springblade.modules.exam.wrapper.ExamPaperWrapper;
 import org.springblade.modules.training.entity.TrainExam;
+import org.springblade.modules.training.entity.TrainingRegistration;
+import org.springblade.modules.training.service.TrainingRegistrationService;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -54,6 +56,9 @@
 public class ExamPaperController extends BladeController {
 
 	private final ExamPaperService examPaperService;
+
+
+	private final TrainingRegistrationService trainingRegistrationService;
 
 
 	/**
@@ -219,13 +224,23 @@
 			examPaper.setAuditTime(new Date());
 			//修改考试审核状态
 			examPaperService.updateById(examPaper);
-
-			//查询当前考试已报名的人员集合数据
-			//生成准考证号
-			getCandidateNo(examPaper);
-			//查询
+			//查询当前考试已报名的人员培训报名数据集合
+			List<TrainingRegistration> trainingRegistrations = examPaperService.getTrainList(examPaper.getId());
+			if (trainingRegistrations.size()>0) {
+				trainingRegistrations.forEach(trainingRegistration -> {
+					//生成准考证号
+					trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
+					//修改培训报名信息
+					trainingRegistrationService.updateById(trainingRegistration);
+				});
+			}
+			return R.status(true);
+		}else {
+			examPaper.setAuditTime(new Date());
+			//修改考试审核状态
+			examPaperService.updateById(examPaper);
+			return R.status(true);
 		}
-		return R.status(false);
 	}
 
 	/**

--
Gitblit v1.9.3