update db

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamRecordDataEntity.java

@@ -24,67 +24,80 @@ import java.util.Date;
         @Index(name = "IDX_E_O_E_R_D_005", columnList = "courseId"),
         @Index(name = "IDX_E_O_E_R_D_006", columnList = "examRecordStatus"),
         @Index(name = "IDX_E_O_E_R_D_007", columnList = "basePaperId"),
-        
+
 })
 @DynamicInsert
 public class ExamRecordDataEntity extends JpaEntity {
+
     /**
      *
      */
     private static final long serialVersionUID = -242327915801750970L;
+
     /**
      * 主键
      */
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     /**
      * 考试ID
      */
     private Long examId;
+
     /**
      * 考试类型
      */
     @Column(length = 20)
     @Enumerated(EnumType.STRING)
     private ExamType examType;
+
     /**
      * 考生ID
      */
     private Long examStudentId;
+
     /**
      * 学生ID
      */
     private Long studentId;
+
     /**
      * 学号
      */
     @Column(length = 50)
     private String studentCode;
+
     /**
      * 学生姓名
      */
     @Column(length = 20)
     private String studentName;
+
     /**
      * 身份证号
      */
     @Column(length = 20)
     private String identityNumber;
+
     /**
      * 课程ID
      */
     private Long courseId;
 
     private String courseLevel;
+
     /**
      * 学习中心ID
      */
     private Long orgId;
+
     /**
      * 顶级机构ID
      */
     private Long rootOrgId;
+
     /**
      * 基础试卷ID
      */
@@ -94,10 +107,12 @@ public class ExamRecordDataEntity extends JpaEntity {
      * 试卷类型
      */
     private String paperType;
+
     /**
      * 试卷结构 ID
      */
     private String paperStructId;
+
     /**
      * 采集人
      */
@@ -108,31 +123,38 @@ public class ExamRecordDataEntity extends JpaEntity {
      * 考试作答记录id
      */
     private String examRecordQuestionsId;
+
     /**
      * 考试记录状态(考试中,考试结束,考试过期,考试作废)
      */
     @Enumerated(EnumType.STRING)
     private ExamRecordStatus examRecordStatus;
+
     /**
      * 考试开始时间(即开始答题时间)
      */
     private Date startTime;
+
     /**
      * 考试结束时间
      */
     private Date endTime;
+
     /**
      * 考试被清理时间
      */
     private Date cleanTime;
+
     /**
      * 是否异常数据
      */
     private Boolean isWarn;
+
     /**
      * 是否被审核过
      */
     private Boolean isAudit;
+
     /**
      * 是否违纪
      */
@@ -143,52 +165,64 @@ public class ExamRecordDataEntity extends JpaEntity {
      * 考试时长
      */
     private Long usedExamTime;
+
     /**
      * 第几次考试
      */
     private Integer examOrder;
+
     /**
      * 是否为重考
      */
     @Column(name = "is_reexamine")
     private Boolean isReexamine;
+
     /**
      * 是否断点续考
      */
     @Column(name = "is_continued")
     private Boolean isContinued;
+
     /**
      * 是否是全客观题卷  1:是   0:否
      */
     private Boolean isAllObjectivePaper;
+
     /**
      * 断点续考次数
      */
     private Integer continuedCount;
+
     /**
      * 是否达到最大断点限制
      */
     private Boolean isExceed;
+
     /**
      * 抓拍比对成功次数
      */
     private Integer faceSuccessCount;
+
     /**
      * 抓拍比对失败次数
      */
     private Integer faceFailedCount;
+
     /**
      * 抓拍存在陌生人的次数
      */
     private Integer faceStrangerCount;
+
     /**
      * 抓拍比对总次数
      */
     private Integer faceTotalCount;
+
     /**
      * 抓拍比对成功比率
      */
     private Double faceSuccessPercent;
+
     /**
      * @see cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess
      * 活体检测结果
@@ -201,6 +235,7 @@ public class ExamRecordDataEntity extends JpaEntity {
      * 百度人脸活体检测通过率
      */
     private Double baiduFaceLivenessSuccessPercent;
+
     /**
      * 人脸五官坐标比对值
      */
@@ -248,6 +283,18 @@ public class ExamRecordDataEntity extends JpaEntity {
      */
     private Integer switchScreenCount;
 
+    /**
+     * 是否采用千人千卷规则（默认：false 为正常调卷规则）
+     */
+    @Column(columnDefinition = "bit(1) not null default 0")
+    private Boolean randomPaper;
+
+    /**
+     * 试卷总分
+     */
+    @Column(columnDefinition = "double not null default 0")
+    private Double paperScore;
+
     /**
      * ip（忽略该字段持久化）
      */
@@ -657,4 +704,21 @@ public class ExamRecordDataEntity extends JpaEntity {
     public void setAuditUserName(String auditUserName) {
         this.auditUserName = auditUserName;
     }
+
+    public Boolean getRandomPaper() {
+        return randomPaper;
+    }
+
+    public void setRandomPaper(Boolean randomPaper) {
+        this.randomPaper = randomPaper;
+    }
+
+    public Double getPaperScore() {
+        return paperScore;
+    }
+
+    public void setPaperScore(Double paperScore) {
+        this.paperScore = paperScore;
+    }
+
 }

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamStatisticEntity.java

@@ -0,0 +1,130 @@
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
+
+import cn.com.qmth.examcloud.web.jpa.JpaEntity;
+
+import javax.persistence.*;
+
+/**
+ * 考试统计信息
+ */
+@Entity
+@Table(name = "ec_oe_exam_statistic", indexes = {
+        @Index(name = "IDX_OE_ES_001", columnList = "examId"),
+        @Index(name = "IDX_OE_ES_002", columnList = "courseId"),
+        @Index(name = "IDX_OE_ES_003", columnList = "orgId")
+})
+public class ExamStatisticEntity extends JpaEntity {
+
+    private static final long serialVersionUID = 5848131928610104861L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 考试ID
+     */
+    @Column(nullable = false)
+    private Long examId;
+
+    /**
+     * 考试ID
+     */
+    @Column(nullable = false)
+    private Long courseId;
+
+    /**
+     * 中心ID
+     */
+    @Column(nullable = false)
+    private Long orgId;
+
+    /**
+     * 应考人数
+     */
+    @Column(nullable = false)
+    private Integer allCount;
+
+    /**
+     * 实考人数
+     */
+    @Column(nullable = false)
+    private Integer finishCount;
+
+    /**
+     * （成绩）及格人数
+     */
+    @Column(nullable = false)
+    private Integer passScoreCount;
+
+    /**
+     * （成绩）优秀人数
+     */
+    @Column(nullable = false)
+    private Integer goodScoreCount;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public Integer getAllCount() {
+        return allCount;
+    }
+
+    public void setAllCount(Integer allCount) {
+        this.allCount = allCount;
+    }
+
+    public Integer getFinishCount() {
+        return finishCount;
+    }
+
+    public void setFinishCount(Integer finishCount) {
+        this.finishCount = finishCount;
+    }
+
+    public Integer getPassScoreCount() {
+        return passScoreCount;
+    }
+
+    public void setPassScoreCount(Integer passScoreCount) {
+        this.passScoreCount = passScoreCount;
+    }
+
+    public Integer getGoodScoreCount() {
+        return goodScoreCount;
+    }
+
+    public void setGoodScoreCount(Integer goodScoreCount) {
+        this.goodScoreCount = goodScoreCount;
+    }
+
+}