deason преди 6 години
родител
ревизия
31a5c5dca5

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

@@ -7,6 +7,8 @@
 
 package cn.com.qmth.examcloud.core.print.service.bean.coursestatistic;
 
+import cn.com.qmth.examcloud.core.print.enums.PaperBindingStatus;
+
 import java.io.Serializable;
 
 /**
@@ -17,6 +19,7 @@ import java.io.Serializable;
  */
 public class CourseStatisticInfo implements Serializable {
     private static final long serialVersionUID = 1L;
+    private Long id;
     /**
      * 学校机构ID
      */
@@ -50,9 +53,10 @@ public class CourseStatisticInfo implements Serializable {
      */
     private String paperType;
     /**
-     * 试卷状态
+     * @See PaperBindingStatus.java
+     * 试卷绑定状态
      */
-    private String paperStatus;
+    private Integer bindingStatus;
     /**
      * 试卷文件URL
      */
@@ -70,6 +74,18 @@ public class CourseStatisticInfo implements Serializable {
      */
     private Integer totalStudent;
 
+    public String getBindingStatusName() {
+        return PaperBindingStatus.getNameByIndex(bindingStatus);
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getOrgId() {
         return orgId;
     }
@@ -134,12 +150,12 @@ public class CourseStatisticInfo implements Serializable {
         this.paperType = paperType;
     }
 
-    public String getPaperStatus() {
-        return paperStatus;
+    public Integer getBindingStatus() {
+        return bindingStatus;
     }
 
-    public void setPaperStatus(String paperStatus) {
-        this.paperStatus = paperStatus;
+    public void setBindingStatus(Integer bindingStatus) {
+        this.bindingStatus = bindingStatus;
     }
 
     public String getPaperFileUrl() {

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

@@ -33,9 +33,10 @@ public class CourseStatisticQuery extends PageQuery implements JsonSerializable
      */
     private Long paperId;
     /**
-     * 试卷状态
+     * @See PaperBindingStatus.java
+     * 试卷绑定状态
      */
-    private String paperStatus;
+    private Integer bindingStatus;
 
     public Long getOrgId() {
         return orgId;
@@ -69,12 +70,12 @@ public class CourseStatisticQuery extends PageQuery implements JsonSerializable
         this.paperId = paperId;
     }
 
-    public String getPaperStatus() {
-        return paperStatus;
+    public Integer getBindingStatus() {
+        return bindingStatus;
     }
 
-    public void setPaperStatus(String paperStatus) {
-        this.paperStatus = paperStatus;
+    public void setBindingStatus(Integer bindingStatus) {
+        this.bindingStatus = bindingStatus;
     }
 
 }

+ 3 - 0
examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/PrintingProjectStatisticServiceImpl.java

@@ -9,6 +9,7 @@ package cn.com.qmth.examcloud.core.print.service.impl;
 
 import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.core.print.entity.PrintingProject;
+import cn.com.qmth.examcloud.core.print.repository.ProjectStatisticRepository;
 import cn.com.qmth.examcloud.core.print.service.CourseStatisticService;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectService;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectStatisticService;
@@ -25,6 +26,8 @@ import static cn.com.qmth.examcloud.core.print.common.Constants.PRT_CODE_500;
  */
 @Service
 public class PrintingProjectStatisticServiceImpl implements PrintingProjectStatisticService {
+    @Autowired
+    private ProjectStatisticRepository projectStatisticRepository;
     @Autowired
     private PrintingProjectService printingProjectService;
     @Autowired