From 7b18a6778a4ab36ff4181ebcef1d2f747a7291c6 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 03 Aug 2021 15:45:09 +0800
Subject: [PATCH] 1.新增培训考试生成准考证号码 2.考试报名清册导入功能实现

---
 src/main/java/org/springblade/modules/training/controller/TrainExamController.java |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/training/controller/TrainExamController.java b/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
index de13373..37c6901 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
@@ -4,16 +4,23 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.common.utils.arg;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.apply.entity.ExamPayment;
+import org.springblade.modules.apply.service.ExamPaymentService;
 import org.springblade.modules.exam.entity.ExamPaper;
+import org.springblade.modules.exam.entity.ExamScore;
+import org.springblade.modules.exam.service.ExamPaperService;
 import org.springblade.modules.training.entity.TrainExam;
 import org.springblade.modules.training.service.TrainExamService;
 import org.springblade.modules.training.vo.TrainExamVo;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -28,6 +35,8 @@
 public class TrainExamController {
 
 	private final TrainExamService trainExamService;
+
+	private final ExamPaperService examPaperService;
 
 	/**
 	 * 自定义分页
@@ -46,7 +55,8 @@
 	 */
 	@PostMapping("/save")
 	@ApiOperation(value = "新增", notes = "传入trainExam")
-	public R save(@RequestBody TrainExam trainExam) {
+	public R save(@RequestBody TrainExam trainExam) throws Exception {
+		arg.test01(arg.url+"/trainExam/save",trainExam);
 		return R.status(trainExamService.save(trainExam));
 	}
 
@@ -55,7 +65,43 @@
 	 * @param trainExam 报名培训申请信息对象
 	 */
 	@PostMapping("/update")
-	public R update(@RequestBody TrainExam trainExam) {
+	public R update(@RequestBody TrainExam trainExam) throws Exception {
+		arg.test01(arg.url+"/trainExam/update",trainExam);
+		return R.status(trainExamService.updateById(trainExam));
+	}
+
+	/**
+	 * 审核修改
+	 * @param trainExam 报名培训申请信息对象
+	 */
+	@PostMapping("/update-audit")
+	public R updateAudit(@RequestBody TrainExam trainExam) throws Exception {
+		trainExam.setAuditTime(new Date());
+		//内网数据同步
+		arg.test01(arg.url+"/trainExam/update-audit",trainExam);
+		//审核通过，插入一条考试信息
+		if (trainExam.getAuditStatus()==1){
+			//查询考试申请
+			TrainExam exam = trainExamService.getById(trainExam.getId());
+			//如果已通过申请，则修改后返回
+			if (exam.getAuditStatus()==1){
+				return R.status(trainExamService.updateById(trainExam));
+			}
+			ExamPaper examPaper = new ExamPaper();
+			examPaper.setTrainExamId(trainExam.getId());
+			examPaper.setExamName(trainExam.getTrainExamName());
+			examPaper.setStartTime(trainExam.getStartTime());
+			examPaper.setEndTime(trainExam.getEndTime());
+			examPaper.setCreatorDate(new Date());
+			//区间时间
+			String start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(trainExam.getStartTime());
+			String end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(trainExam.getEndTime());
+			String examTime = "[\"" +start+ "\""+","+"\"" +end+ "\"]";
+			examPaper.setExamTime(examTime);
+			//1:正式考试  2:模拟考试
+			examPaper.setExamType(2);
+			examPaperService.save(examPaper);
+		}
 		return R.status(trainExamService.updateById(trainExam));
 	}
 
@@ -64,11 +110,12 @@
 	 * @param trainExam 报名培训申请信息对象
 	 */
 	@PostMapping("/submit")
-	public R submit(@RequestBody TrainExam trainExam) {
+	public R submit(@RequestBody TrainExam trainExam) throws Exception {
 		if (null==trainExam.getId()){
 			trainExam.setCreateTime(new Date());
 			trainExam.setAuditStatus(3);
 		}
+		arg.test01(arg.url+"/trainExam/submit",trainExam);
 		return R.status(trainExamService.saveOrUpdate(trainExam));
 	}
 
@@ -78,6 +125,7 @@
 	 */
 	@PostMapping("/remove")
 	public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+		arg.sendPostRemoveByIds(arg.url+"/trainExam/remove",ids);
 		return R.status(trainExamService.removeByIds(Func.toLongList(ids)));
 	}
 

--
Gitblit v1.9.3