数据库字段调整

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/CoursePaper.java

@@ -20,7 +20,8 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "ec_prt_course_paper", indexes = {
         @Index(name = "INDEX_PRT_COURSE_PAPER_01", columnList = "orgId"),
-        @Index(name = "INDEX_PRT_COURSE_PAPER_02", columnList = "examId")})
+        @Index(name = "INDEX_PRT_COURSE_PAPER_02", columnList = "examId"),
+        @Index(name = "INDEX_PRT_COURSE_PAPER_03", columnList = "courseId")})
 public class CoursePaper extends IdEntity {
     /**
      * 学校机构ID

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/CourseStatistic.java

@@ -48,10 +48,10 @@ public class CourseStatistic extends IdEntity {
     @Column(length = 50)
     private String paperType;
     /**
-     * @See PaperBindingStatus.java
-     * 试卷绑定状态
+     * @See PaperStatus.java
+     * 考试的试卷状态
      */
-    private Integer paperBindingStatus;
+    private Integer paperStatus;
     /**
      * 考生人数
      */
@@ -120,12 +120,12 @@ public class CourseStatistic extends IdEntity {
         this.paperType = paperType;
     }
 
-    public Integer getPaperBindingStatus() {
-        return paperBindingStatus;
+    public Integer getPaperStatus() {
+        return paperStatus;
     }
 
-    public void setPaperBindingStatus(Integer paperBindingStatus) {
-        this.paperBindingStatus = paperBindingStatus;
+    public void setPaperStatus(Integer paperStatus) {
+        this.paperStatus = paperStatus;
     }
 
     public Integer getTotalStudent() {

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/enums/PaperBindingStatus.java → examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/enums/PaperStatus.java

@@ -8,12 +8,21 @@
 package cn.com.qmth.examcloud.core.print.enums;
 
 /**
- * 课程试卷绑定状态
+ * 传统考试的试卷状态
  */
-public enum PaperBindingStatus {
+public enum PaperStatus {
+    /**
+     * 试卷尚未从题库中推过来
+     */
     无(0),
-    已有(1),
-    未指定(2);
+    /**
+     * 试卷已推过来，但未分配
+     */
+    未指定(1),
+    /**
+     * 试卷已分配
+     */
+    已有(2);
 
     private int index;
 
@@ -21,7 +30,7 @@ public enum PaperBindingStatus {
         if (index == null) {
             return null;
         }
-        for (PaperBindingStatus type : PaperBindingStatus.values()) {
+        for (PaperStatus type : PaperStatus.values()) {
             if (type.getIndex() == index) {
                 return type.name();
             }
@@ -29,7 +38,7 @@ public enum PaperBindingStatus {
         return null;
     }
 
-    PaperBindingStatus(int index) {
+    PaperStatus(int index) {
         this.index = index;
     }
 

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursestatistic/CourseStatisticConvert.java

@@ -33,7 +33,7 @@ public class CourseStatisticConvert {
         info.setCourseCode(statistic.getCourseCode());
         info.setCourseName(statistic.getCourseName());
         info.setPaperType(statistic.getPaperType());
-        info.setPaperBindingStatus(statistic.getPaperBindingStatus());
+        info.setPaperStatus(statistic.getPaperStatus());
         info.setTotalStudent(statistic.getTotalStudent());
 
         CoursePaper paper = statistic.getCoursePaper();

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursestatistic/CourseStatisticInfo.java

@@ -7,7 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.coursestatistic;
 
-import cn.com.qmth.examcloud.core.print.enums.PaperBindingStatus;
+import cn.com.qmth.examcloud.core.print.enums.PaperStatus;
 
 import java.io.Serializable;
 
@@ -41,10 +41,10 @@ public class CourseStatisticInfo implements Serializable {
      */
     private String courseName;
     /**
-     * @See PaperBindingStatus.java
-     * 试卷绑定状态
+     * @See PaperStatus.java
+     * 考试的试卷状态
      */
-    private Integer paperBindingStatus;
+    private Integer paperStatus;
     /**
      * 试卷类型
      */
@@ -74,8 +74,8 @@ public class CourseStatisticInfo implements Serializable {
      */
     private Integer totalStudent;
 
-    public String getBindingStatusName() {
-        return PaperBindingStatus.getNameByIndex(paperBindingStatus);
+    public String getPaperStatusName() {
+        return PaperStatus.getNameByIndex(paperStatus);
     }
 
     public Long getId() {
@@ -126,12 +126,12 @@ public class CourseStatisticInfo implements Serializable {
         this.courseName = courseName;
     }
 
-    public Integer getPaperBindingStatus() {
-        return paperBindingStatus;
+    public Integer getPaperStatus() {
+        return paperStatus;
     }
 
-    public void setPaperBindingStatus(Integer paperBindingStatus) {
-        this.paperBindingStatus = paperBindingStatus;
+    public void setPaperStatus(Integer paperStatus) {
+        this.paperStatus = paperStatus;
     }
 
     public String getPaperType() {

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursestatistic/CourseStatisticQuery.java

@@ -33,10 +33,10 @@ public class CourseStatisticQuery extends PageQuery implements JsonSerializable
      */
     private String paperName;
     /**
-     * @See PaperBindingStatus.java
-     * 试卷绑定状态
+     * @See PaperStatus.java
+     * 考试的试卷状态
      */
-    private Integer paperBindingStatus;
+    private Integer paperStatus;
 
     public Long getOrgId() {
         return orgId;
@@ -70,12 +70,12 @@ public class CourseStatisticQuery extends PageQuery implements JsonSerializable
         this.paperName = paperName;
     }
 
-    public Integer getPaperBindingStatus() {
-        return paperBindingStatus;
+    public Integer getPaperStatus() {
+        return paperStatus;
     }
 
-    public void setPaperBindingStatus(Integer paperBindingStatus) {
-        this.paperBindingStatus = paperBindingStatus;
+    public void setPaperStatus(Integer paperStatus) {
+        this.paperStatus = paperStatus;
     }
 
 }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CourseStatisticServiceImpl.java

@@ -14,7 +14,7 @@ import cn.com.qmth.examcloud.core.print.common.jpa.SqlWrapper;
 import cn.com.qmth.examcloud.core.print.common.utils.Check;
 import cn.com.qmth.examcloud.core.print.entity.CourseStatistic;
 import cn.com.qmth.examcloud.core.print.enums.ExamType;
-import cn.com.qmth.examcloud.core.print.enums.PaperBindingStatus;
+import cn.com.qmth.examcloud.core.print.enums.PaperStatus;
 import cn.com.qmth.examcloud.core.print.repository.CourseStatisticRepository;
 import cn.com.qmth.examcloud.core.print.service.CommonService;
 import cn.com.qmth.examcloud.core.print.service.CourseStatisticService;
@@ -63,8 +63,8 @@ public class CourseStatisticServiceImpl implements CourseStatisticService {
         if (query.getCourseId() != null) {
             searches.eq("courseId", query.getCourseId());
         }
-        if (query.getPaperBindingStatus() != null) {
-            searches.eq("paperBindingStatus", query.getPaperBindingStatus());
+        if (query.getPaperStatus() != null) {
+            searches.eq("paperStatus", query.getPaperStatus());
         }
         if (StringUtils.isBlank(query.getPaperName())) {
             searches.like("coursePaper.paperName", query.getPaperName());
@@ -137,7 +137,7 @@ public class CourseStatisticServiceImpl implements CourseStatisticService {
         statistic.setCourseName(info.getCourseName());
         statistic.setPaperType(info.getPaperType());
         statistic.setTotalStudent(info.getTotalStudent());
-        statistic.setPaperBindingStatus(PaperBindingStatus.无.getIndex());
+        statistic.setPaperStatus(PaperStatus.无.getIndex());
         courseStatisticsRepository.save(statistic);
     }
 

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/CourseStatisticServiceTest.java

@@ -28,7 +28,7 @@ public class CourseStatisticServiceTest extends BaseTest {
         query.setOrgId(1L);
         query.setExamId(1L);
         query.setCourseId(1L);
-        query.setPaperBindingStatus(0);
+        query.setPaperStatus(0);
         //query.setPaperId(1L);
         Page<CourseStatisticInfo> page = courseStatisticService.getCourseStatisticList(query);
         System.out.println(jsonMapper.toJson(page));