考试结果展示功能开发；截止时间展示试卷明细

web/src/main/java/com/ynfy/buss/exam/exam/entity/Exam.java

@@ -146,7 +146,7 @@ public class Exam implements Serializable {
     private Boolean answerDisorder;
 
     /**
-     * 阅卷人类型
+     * 阅卷人类型  1:部门  2：人员
      */
     @Excel(name = "阅卷人类型", width = 15)
     @ApiModelProperty(value = "阅卷人类型")
@@ -178,6 +178,12 @@ public class Exam implements Serializable {
     @ApiModelProperty(value = "图片")
     private String image;
 
+    @ApiModelProperty(value = "考试结果展示类型 1：成绩 2：成绩+试卷明细")
+    private Integer examResultShowtype;
+
+    @ApiModelProperty(value = "展示截止时间")
+    private Integer showDeadline;
+
     /**
      * 是否结束
      *

web/src/main/java/com/ynfy/buss/exam/exam/mapper/xml/ExamMapper.xml

@@ -22,6 +22,8 @@
                 e.question_disorder,
                 e.answer_disorder,
                 e.image,
+                e.exam_result_showtype,
+                e.show_deadline,
                 p.id as paper_id,
                 p.title as paperName,
                 p.total_score,
@@ -59,6 +61,8 @@
         <result column="reviewer" property="reviewer" jdbcType="VARCHAR"/>
         <result column="reviewer_type" property="reviewerType" jdbcType="INTEGER"/>
         <result column="image" property="image" jdbcType="VARCHAR"/>
+        <result column="exam_result_showtype" property="examResultShowtype" jdbcType="INTEGER"/>
+        <result column="show_deadline" property="showDeadline" jdbcType="INTEGER"/>
 
         <association property="paper" javaType="com.ynfy.buss.exam.paper.entity.Paper">
             <id column="paper_id" property="id" jdbcType="VARCHAR"/>

web/src/main/java/com/ynfy/buss/exam/userexam/entity/UserExam.java

@@ -183,6 +183,14 @@ public class UserExam implements Serializable {
     @TableField(exist = false)
     private Integer totalLeaveTimes;
 
+    @ApiModelProperty(value = "考试结果展示类型 1：成绩 2：成绩+试卷明细")
+    @TableField(exist = false)
+    private Integer examResultShowtype;
+
+    @ApiModelProperty(value = "展示截止时间")
+    @TableField(exist = false)
+    private Integer showDeadline;
+
     @TableField(exist = false)
     private Integer leaveTime;
 

web/src/main/java/com/ynfy/buss/exam/userexam/mapper/xml/UserExamMapper.xml

@@ -21,6 +21,11 @@
         <result column="has_subjective" property="hasSubjective" jdbcType="BOOLEAN"/>
         <result column="subjective_score" property="subjectiveScore" jdbcType="INTEGER"/>
         <result column="objective_score" property="objectiveScore" jdbcType="INTEGER"/>
+        <result column="exam_result_showtype" property="examResultShowtype" jdbcType="INTEGER"/>
+        <result column="show_deadline" property="showDeadline" jdbcType="INTEGER"/>
+        <result column="preview_time" property="previewTime" jdbcType="TIMESTAMP"/>
+        <result column="preview_user" property="previewUser" jdbcType="VARCHAR"/>
+
 
         <collection property="userExamQuestionList" ofType="com.ynfy.buss.exam.userexamquestion.entity.UserExamQuestion">
             <id column="ueq_id" property="id" jdbcType="VARCHAR"/>
@@ -56,9 +61,13 @@
             ue.has_subjective,
             ue.subjective_score,
             ue.objective_score,
+            ue.preview_time,
+            ue.preview_user,
             e.leave_on,
             e.total_leave_times,
             e.leave_time,
+            e.exam_result_showtype,
+            e.show_deadline,
             ueq.ID as ueq_id,
             ueq.user_exam_id,
             ueq.question_id,