From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 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..09a4532 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -26,6 +26,7 @@
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.FTP.FtpUtil;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.entity.ExamSubjectChoices;
@@ -34,6 +35,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 +57,9 @@
public class ExamPaperController extends BladeController {
private final ExamPaperService examPaperService;
+
+
+ private final TrainingRegistrationService trainingRegistrationService;
/**
@@ -94,8 +100,15 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入exam")
- public R save(@RequestBody ExamPaper exam) {
- return R.status(examPaperService.save(exam));
+ public R save(@RequestBody ExamPaper examPaper) {
+ boolean save = examPaperService.save(examPaper);
+ String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
+ String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time) " +
+ "values(" + "'" + examPaper.getId() + "'" + "," + "'" + examPaper.getExamName() +
+ "'" + "," + "'" + examPaper.getExamType() +
+ "'" + "," +"'" + format + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
+ return R.status(save);
}
/**
@@ -105,6 +118,11 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入exam")
public R update(@RequestBody ExamPaper exam) {
+ String s1 =
+ "update ksxt_exam set exam_name = " + "'" + exam.getExamName() + "'" +
+ ",start_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(exam.getStartTime()) + "'" +
+ " " +"where id = " + "'" + exam.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
return R.status(examPaperService.updateById(exam));
}
@@ -125,6 +143,13 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入exam")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+ //内网删除
+ List<Long> list = Func.toLongList(ids);
+ list.forEach(id ->{
+ //内网同步
+ String s1 = "delete from ksxt_exam where id = " + "'" + id + "'";
+ FtpUtil.sqlFileUpload(s1);
+ });
boolean temp = examPaperService.removeByIds(Func.toLongList(ids));
return R.status(temp);
}
@@ -136,7 +161,6 @@
@ApiOperationSupport(order = 8)
@ApiOperation(value = "考试题目绑定", notes = "传入exam")
public R setPagerSubject(@ApiParam(value = "主键集合") ExamPaper exam) {
-
return R.status(true);
}
@@ -219,13 +243,39 @@
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);
- //查询当前考试已报名的人员集合数据
- //生成准考证号
- getCandidateNo(examPaper);
- //查询
+ //查询当前考试已报名的人员培训报名数据集合
+ 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);
}
- return R.status(false);
}
/**
--
Gitblit v1.9.3