This commit is contained in:
parent
cc8517e771
commit
0763a7e6a5
|
|
@ -25,6 +25,10 @@ private static final long serialVersionUID = 1L;
|
||||||
private Integer examPaperId;
|
private Integer examPaperId;
|
||||||
/** 试卷名称 */
|
/** 试卷名称 */
|
||||||
private String name;
|
private String name;
|
||||||
|
/**
|
||||||
|
* 考试类型(1-模拟考试;2-正式考试)
|
||||||
|
*/
|
||||||
|
private String type;
|
||||||
/** 是否控制开始结束时间(0-不控制,1-控制) */
|
/** 是否控制开始结束时间(0-不控制,1-控制) */
|
||||||
private String enableControlTime;
|
private String enableControlTime;
|
||||||
/** 开始时间 */
|
/** 开始时间 */
|
||||||
|
|
@ -108,6 +112,14 @@ private static final long serialVersionUID = 1L;
|
||||||
this.enableControlTime = enableControlTime;
|
this.enableControlTime = enableControlTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getType() {
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setType(String type) {
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
|
||||||
/** 获取是否控制开始结束时间(0-不控制,1-控制) */
|
/** 获取是否控制开始结束时间(0-不控制,1-控制) */
|
||||||
public String getEnableControlTime()
|
public String getEnableControlTime()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<result property="deptId" column="dept_id" />
|
<result property="deptId" column="dept_id" />
|
||||||
<result property="examPaperId" column="exam_paper_id" />
|
<result property="examPaperId" column="exam_paper_id" />
|
||||||
<result property="name" column="name" />
|
<result property="name" column="name" />
|
||||||
|
<result property="type" column="type" />
|
||||||
<result property="enableControlTime" column="enable_control_time" />
|
<result property="enableControlTime" column="enable_control_time" />
|
||||||
<result property="startTime" column="start_time" />
|
<result property="startTime" column="start_time" />
|
||||||
<result property="endTime" column="end_time" />
|
<result property="endTime" column="end_time" />
|
||||||
|
|
@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectExamExaminationVo">
|
<sql id="selectExamExaminationVo">
|
||||||
id, dept_id, exam_paper_id, name, enable_control_time, start_time, end_time, time_length, exam_number, pass_mark, question_disorder, finished_paper, exam_end, examination_user_limit, create_by, create_date, update_by, update_date, remarks, del_flag </sql>
|
id, dept_id, exam_paper_id, name,type, enable_control_time, start_time, end_time, time_length, exam_number, pass_mark, question_disorder, finished_paper, exam_end, examination_user_limit, create_by, create_date, update_by, update_date, remarks, del_flag </sql>
|
||||||
|
|
||||||
<select id="selectExamExaminationList" parameterType="ExamExamination" resultMap="ExamExaminationResult">
|
<select id="selectExamExaminationList" parameterType="ExamExamination" resultMap="ExamExaminationResult">
|
||||||
select
|
select
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<result property="id" column="id" />
|
<result property="id" column="id" />
|
||||||
<result property="deptId" column="dept_id" />
|
<result property="deptId" column="dept_id" />
|
||||||
<result property="name" column="name" />
|
<result property="name" column="name" />
|
||||||
<result property="price" column="price" />
|
|
||||||
<result property="enableControlTime" column="enable_control_time" />
|
<result property="enableControlTime" column="enable_control_time" />
|
||||||
<result property="startTime" column="start_time" />
|
<result property="startTime" column="start_time" />
|
||||||
<result property="endTime" column="end_time" />
|
<result property="endTime" column="end_time" />
|
||||||
|
|
@ -22,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectExamPracticeVo">
|
<sql id="selectExamPracticeVo">
|
||||||
id, dept_id, name, price,enable_control_time, start_time, end_time, practice_user_limit, create_by, create_date, update_by, update_date, remarks, del_flag </sql>
|
id, dept_id, name,enable_control_time, start_time, end_time, practice_user_limit, create_by, create_date, update_by, update_date, remarks, del_flag </sql>
|
||||||
|
|
||||||
<select id="selectExamPracticeList" parameterType="ExamPractice" resultMap="ExamPracticeResult">
|
<select id="selectExamPracticeList" parameterType="ExamPractice" resultMap="ExamPracticeResult">
|
||||||
select
|
select
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<parent>
|
||||||
|
<artifactId>ruoyi</artifactId>
|
||||||
|
<groupId>com.ruoyi</groupId>
|
||||||
|
<version>3.1</version>
|
||||||
|
</parent>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<artifactId>tuoyi-test</artifactId>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-framework</artifactId>
|
||||||
|
<version>${ruoyi.version}</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
|
||||||
|
</project>
|
||||||
Loading…
Reference in New Issue