From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 95 +++++++++++++++++++++++++++--------------------
1 files changed, 54 insertions(+), 41 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 09a4532..8b2421d 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -76,7 +76,7 @@
/**
* 分页
*/
- @GetMapping("/page")
+ @GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入exam")
public R<IPage<ExamPaperVO>> list(@ApiIgnore @RequestParam Map<String, Object> exam, Query query) {
@@ -88,8 +88,21 @@
* 分页
*/
@GetMapping("/pages")
- public R<IPage<ExamPaperVO>> page(ExamPaperVO exam, Query query) {
- IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPage(Condition.getPage(query), exam);
+ public R<IPage<ExamPaperVO>> pages(ExamPaperVO exam, Query query) {
+ IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPages(Condition.getPage(query), exam);
+ return R.data(pages);
+ }
+
+
+ /**
+ * 自定义查询
+ * @param query 分页条件
+ * @param examPaperVO 查询参数
+ * @return
+ */
+ @GetMapping("/page")
+ public R<IPage<ExamPaperVO>> page(ExamPaperVO examPaperVO, Query query) {
+ IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPage(Condition.getPage(query), examPaperVO);
return R.data(pages);
}
@@ -196,7 +209,6 @@
Date date = new Date();
String strDateFormat = "yyyy-MM-dd HH:mm:ss";
SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
- System.out.println(sdf.format(date));
return R.data(sdf.format(date));
}
@@ -238,44 +250,45 @@
@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());
+// System.out.println("trainingRegistrations = " + trainingRegistrations);
+ 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