From c8ebf3038d2a7f69d9eb40f5a276dc3fa826fa9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 21:42:52 +0800
Subject: [PATCH] 报名接口修改,考试计算成绩接口修改,对比答案修改为对比所有题目

---
 src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 55c4fdd..65455cb 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -81,7 +81,6 @@
 	 */
 	@PostMapping("/update")
 	public R update(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
-		arg.test01(arg.url+"/trainingRegistration/update",trainingRegistration);
 		return R.status(trainingRegistrationService.updateById(trainingRegistration));
 	}
 
@@ -94,19 +93,18 @@
 		if (null==trainingRegistration.getId()){
 			//查询是否已报名
 			Integer registration = trainingRegistrationService.getTrainingRegistrationInfo(trainingRegistration);
-			if (null==registration){
+			if (null!=registration){
 				return R.data(201,"已报名,不能重复报名");
 			}
 			trainingRegistration.setTrainingTime(new Date());
 			trainingRegistration.setCancel(1);
 			//默认报名未考试状态
-			trainingRegistration.setIsExam(1);
+//			trainingRegistration.setIsExam(1);
 			//去生成准考证号码
-			trainingRegistration.setCandidateNo(getCandidateNo(trainingRegistration));
+//			trainingRegistration.setCandidateNo(getCandidateNo(trainingRegistration));
 			//去生成考试编号
 //			trainingRegistration.setApplyCode(getApplyCode(trainingRegistration));
 		}
-//		arg.test01(arg.url+"/trainingRegistration/submit",trainingRegistration);
 		boolean status = trainingRegistrationService.saveOrUpdate(trainingRegistration);
 		if (status){
 			return R.data(200,"报名成功");
@@ -120,7 +118,6 @@
 	 */
 	@PostMapping("/remove")
 	public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
-		arg.sendPostRemoveByIds(arg.url+"/trainingRegistration/remove",ids);
 		return R.status(trainingRegistrationService.removeByIds(Func.toLongList(ids)));
 	}
 

--
Gitblit v1.9.3