考试报名查询正式考试和补考
This commit is contained in:
parent
15ea79b78c
commit
baf76b9dbf
@ -27,9 +27,9 @@ public class UserExamReqDTO extends UserExamDTO {
|
||||
private String realName;
|
||||
|
||||
/**
|
||||
* 考试类型(1:模拟考试,2:正式考试,3:补考)
|
||||
* 考试类型(0:正式考试和补考,1:模拟考试,2:正式考试,3:补考)
|
||||
* */
|
||||
@ApiModelProperty(value = "考试类型(1:模拟考试,2:正式考试,3:补考)", required=true)
|
||||
@ApiModelProperty(value = "考试类型(0:正式考试和补考,1:模拟考试,2:正式考试,3:补考)", required=true)
|
||||
private Integer examType;
|
||||
|
||||
|
||||
|
||||
@ -1,9 +1,14 @@
|
||||
package com.yf.exam.modules.user.exam.dto.response;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yf.exam.modules.user.exam.dto.UserExamDTO;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalTime;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@ -31,5 +36,46 @@ public class UserExamRespDTO extends UserExamDTO {
|
||||
|
||||
@ApiModelProperty(value = "人员名称", required=true)
|
||||
private String realName;
|
||||
|
||||
/**
|
||||
* 开始日期
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "开始日期", required=true)
|
||||
private LocalDate startDate;
|
||||
|
||||
/**
|
||||
* 结束日期
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "结束日期", required=true)
|
||||
private LocalDate endDate;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
|
||||
@DateTimeFormat(pattern = "HH:mm")
|
||||
@ApiModelProperty(value = "开始时间", required=true)
|
||||
private LocalTime startTime;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
|
||||
@DateTimeFormat(pattern = "HH:mm")
|
||||
@ApiModelProperty(value = "结束时间", required=true)
|
||||
private LocalTime endTime;
|
||||
|
||||
@ApiModelProperty(value = "总分数", required=true)
|
||||
private Integer totalScore;
|
||||
|
||||
@ApiModelProperty(value = "总时长(分钟)", required=true)
|
||||
private Integer totalTime;
|
||||
|
||||
@ApiModelProperty(value = "及格分数", required=true)
|
||||
private Integer qualifyScore;
|
||||
|
||||
/**
|
||||
* 考试费用
|
||||
*/
|
||||
@ApiModelProperty(value = "考试费用", required=true)
|
||||
private BigDecimal examFee;
|
||||
|
||||
}
|
||||
|
||||
@ -29,7 +29,9 @@
|
||||
|
||||
|
||||
<select id="paging" resultMap="ListResultMap">
|
||||
SELECT ue.*,ee.title,ee.exam_type, uc.real_name FROM el_user_exam ue
|
||||
SELECT ue.*
|
||||
,ee.title,ee.exam_type,ee.start_date, ee.end_date, ee.start_time, ee.end_time, ee.total_score, ee.total_time, ee.qualify_score, ee.exam_fee
|
||||
, uc.real_name FROM el_user_exam ue
|
||||
LEFT JOIN el_exam ee ON ue.exam_id=ee.id
|
||||
LEFT JOIN sys_user uc ON ue.user_id=uc.id
|
||||
WHERE ee.id IS NOT NULL AND uc.id IS NOT NULL
|
||||
@ -46,7 +48,13 @@
|
||||
AND ee.title LIKE CONCAT('%',#{query.title},'%')
|
||||
</if>
|
||||
<if test="query.examType!=null">
|
||||
AND ee.exam_type = #{query.examType}
|
||||
<if test="query.examType = 1">
|
||||
AND ee.exam_type = #{query.examType}
|
||||
</if>
|
||||
-- 正式考试和补考传0
|
||||
<if test="query.examType = 0">
|
||||
AND (ee.exam_type = 2 or ee.exam_type = 3)
|
||||
</if>
|
||||
</if>
|
||||
<if test="query.realName!=null and query.realName!=''">
|
||||
AND uc.real_name LIKE CONCAT('%',#{query.realName},'%')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user