智慧保安后台管理项目备份
Administrator
2021-07-30 10b2508d4f14334af01d9dfa2e1f1052f57932e4
考试申请代码同步
3 files modified
51 ■■■■■ changed files
src/main/java/org/springblade/modules/exam/entity/ExamPaper.java 11 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/training/controller/TrainExamController.java 32 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/training/entity/TrainExam.java 8 ●●●●● patch | view | raw | blame | history
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;
}
src/main/java/org/springblade/modules/training/controller/TrainExamController.java
@@ -8,6 +8,8 @@
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.exam.entity.ExamPaper;
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;
@@ -27,6 +29,8 @@
public class TrainExamController {
    private final TrainExamService trainExamService;
    private final ExamPaperService examPaperService;
    /**
     * 自定义分页
@@ -58,6 +62,34 @@
        return R.status(trainExamService.updateById(trainExam));
    }
    /**
     * 审核修改
     * @param trainExam 报名培训申请信息对象
     */
    @PostMapping("/update-audit")
    public R updateAudit(@RequestBody TrainExam trainExam) throws Exception {
        //审核通过,插入一条考试信息
        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());
            //1:正式考试  2:模拟考试
            examPaper.setExamType(2);
            examPaperService.save(examPaper);
        }
        return R.status(trainExamService.updateById(trainExam));
    }
    /**
     * 新增或修改
     * @param trainExam 报名培训申请信息对象
src/main/java/org/springblade/modules/training/entity/TrainExam.java
@@ -98,4 +98,12 @@
    @TableField("audit_detail")
    private String auditDetail;
    /**
     * 审核时间
     */
    @TableField("audit_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date auditTime;
}