From 8c3b7cd86651899e37d7577fb61e087f5ccd0364 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 30 Jul 2021 21:37:49 +0800
Subject: [PATCH] 考试时间区间修改
---
src/main/java/org/springblade/modules/training/controller/TrainExamController.java | 33 ++++++++++++++++++++++++++++++++-
src/main/java/org/springblade/modules/exam/entity/ExamPaper.java | 11 +++++++++++
2 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java b/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
index ee02a5b..1fa88a0 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
@@ -17,10 +17,13 @@
package org.springblade.modules.exam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -91,6 +94,8 @@
/**
* 创建时间
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date creatorDate;
/**
@@ -98,5 +103,11 @@
*/
private String remark;
+ /**
+ * 培训考试id
+ */
+ @TableField("train_exam_id")
+ private Long trainExamId;
+
}
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 1698b93..d410d44 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
@@ -9,12 +9,18 @@
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;
@@ -29,6 +35,8 @@
public class TrainExamController {
private final TrainExamService trainExamService;
+
+ private final ExamPaperService examPaperService;
/**
* 自定义分页
@@ -69,7 +77,30 @@
@PostMapping("/update-audit")
public R updateAudit(@RequestBody TrainExam trainExam) throws Exception {
trainExam.setAuditTime(new Date());
- arg.test01(arg.url+"/trainExam/update",trainExam);
+ 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));
}
--
Gitblit v1.9.3