From 2b7013958fc02dd1d41b780d08768636df4e5c1f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Sep 2021 14:11:25 +0800
Subject: [PATCH] 考试报名列表接口修改,考试生成修改

---
 src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java |   74 ++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 37 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 cda5261..867c7fe 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -250,44 +250,44 @@
 	@PostMapping("/update-audit")
 	public R updateAudit(@RequestBody ExamPaper examPaper){
 		examPaper.setAuditTime(new Date());
-		//审核通过,插入一条考试信息
-		if (examPaper.getAuditStatus()==1){
-			examPaper.setAuditTime(new Date());
-			//修改考试审核状态
-			examPaperService.updateById(examPaper);
-			String s1 =
-				"update ksxt_exam set audit_status = " + "'" + examPaper.getAuditStatus()+ "'"
-					+ ",audit_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getAuditTime())+ "'"
-					+ " " +"where id = " + "'" + examPaper.getId() + "'";
-			FtpUtil.sqlFileUpload(s1);
-
-			//查询当前考试已报名的人员培训报名数据集合
-			List<TrainingRegistration> trainingRegistrations = examPaperService.getTrainList(examPaper.getId());
-			if (trainingRegistrations.size()>0) {
-				trainingRegistrations.forEach(trainingRegistration -> {
-					//生成准考证号
-					trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
-					//修改培训报名信息
-					trainingRegistrationService.updateById(trainingRegistration);
-					String s2 =
-						"update sys_training_registration set candidate_no = " + "'" + trainingRegistration.getCandidateNo()+ "'"
-							+ " " +"where id = " + "'" + trainingRegistration.getId() + "'";
-					FtpUtil.sqlFileUpload(s2);
-				});
-			}
-			return R.status(true);
-		}else {
-			examPaper.setAuditTime(new Date());
-			//修改考试审核状态
-			examPaperService.updateById(examPaper);
-
-			String s3 =
-				"update ksxt_exam set audit_status = " + "'" + examPaper.getAuditStatus()+ "'"
-					+ ",audit_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getAuditTime())+ "'"
-					+ " " +"where id = " + "'" + examPaper.getId() + "'";
-			FtpUtil.sqlFileUpload(s3);
-			return R.status(true);
+		//修改考试审核状态
+		boolean status = examPaperService.updateById(examPaper);
+		//数据同步
+		String s1 =
+			"update ksxt_exam set audit_status = " + "'" + examPaper.getAuditStatus()+ "'"
+				+ ",audit_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getAuditTime())+ "'"
+				+ " " +"where id = " + "'" + examPaper.getId() + "'";
+		FtpUtil.sqlFileUpload(s1);
+		//查询当前考试已报名的人员培训报名数据集合
+		List<TrainingRegistration> trainingRegistrations = examPaperService.getTrainList(examPaper.getId());
+		if (trainingRegistrations.size()>0) {
+			trainingRegistrations.forEach(trainingRegistration -> {
+				//生成准考证号
+				trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
+				//审核通过
+				if (examPaper.getAuditStatus()==1) {
+					trainingRegistration.setAuditStatus(1);
+				}
+				//审核不通过
+				if (examPaper.getAuditStatus()==2) {
+					trainingRegistration.setAuditStatus(2);
+				}
+				//待审核
+				if (examPaper.getAuditStatus()==3) {
+					trainingRegistration.setAuditStatus(3);
+				}
+				//修改培训报名信息
+				trainingRegistrationService.updateById(trainingRegistration);
+				//数据同步
+				String s2 =
+					"update sys_training_registration set candidate_no = " + "'" + trainingRegistration.getCandidateNo()+ "'"
+						+ ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+						+ " " +"where id = " + "'" + trainingRegistration.getId() + "'";
+				FtpUtil.sqlFileUpload(s2);
+			});
 		}
+		//返回
+		return R.status(status);
 	}
 
 	/**

--
Gitblit v1.9.3