merge from release_v3.0

examcloud-core-basic-api-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-basic-api-client</artifactId>
 	<packaging>jar</packaging>

examcloud-core-basic-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-basic-api</artifactId>
 

examcloud-core-examwork-api-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-examwork-api-client</artifactId>
 	<packaging>jar</packaging>

examcloud-core-examwork-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-examwork-api</artifactId>
 	<packaging>jar</packaging>

examcloud-core-marking-api-client/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>examcloud-rpc</artifactId>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

examcloud-core-marking-api/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>examcloud-rpc</artifactId>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

examcloud-core-oe-admin-api-client/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 
 	<dependencies>

examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamScoreDataCloudServiceClient.java

@@ -12,7 +12,8 @@ public class ExamScoreDataCloudServiceClient extends AbstractCloudClientSupport
     private static final long serialVersionUID = 702370114207337204L;
 
     @Override
-    public FindExamScoreDataResp findExamScoreDataByScoreId(FindExamScoreDataReq findExamScoreDataReq) {
+    public FindExamScoreDataResp findExamScoreDataByScoreId(
+            FindExamScoreDataReq findExamScoreDataReq) {
         return post("examScoreData/findExamScoreDataByScoreId", findExamScoreDataReq,
                 FindExamScoreDataResp.class);
     }
@@ -53,5 +54,4 @@ public class ExamScoreDataCloudServiceClient extends AbstractCloudClientSupport
     public GetFinalScoreDataResp getFinalScoreData(GetFinalScoreDataReq req) {
         return post("examScoreData/getFinalScoreData", req, GetFinalScoreDataResp.class);
     }
-
 }

examcloud-core-oe-admin-api/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 
 	<dependencies>

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/ExamScoreDataCloudService.java

@@ -75,5 +75,4 @@ public interface ExamScoreDataCloudService extends CloudService {
      */
     GetFinalScoreDataResp getFinalScoreData(GetFinalScoreDataReq req);
 
-
 }

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/PagedToBeMarkExamRecordBean.java

@@ -57,6 +57,11 @@ public class PagedToBeMarkExamRecordBean implements JsonSerializable {
      */
     private String grade;
 
+    /**
+     * 身份证号
+     */
+    private String identityNumber;
+
     /**
      * 待阅的主观题集合
      */
@@ -141,4 +146,12 @@ public class PagedToBeMarkExamRecordBean implements JsonSerializable {
     public void setGrade(String grade) {
         this.grade = grade;
     }
+
+    public String getIdentityNumber() {
+        return identityNumber;
+    }
+
+    public void setIdentityNumber(String identityNumber) {
+        this.identityNumber = identityNumber;
+    }
 }

examcloud-core-oe-student-api-client/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-student-api-client</artifactId>
 	<dependencies>

examcloud-core-oe-student-api/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-student-api</artifactId>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>cn.com.qmth.examcloud.question</groupId>
             <artifactId>examcloud-question-commons</artifactId>
-            <version>2019-SNAPSHOT</version>
+            <version>v3.0-RELEASE</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

examcloud-core-oe-student-api/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/response/GetExamRecordNumResp.java

@@ -1,7 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.student.api.response;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
-import cn.com.qmth.examcloud.core.oe.student.api.bean.FaceBiopsyBean;
 
 /**
  * @Description 获取考试记录数量

examcloud-core-oe-task-api-client/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 
 	<artifactId>examcloud-core-oe-task-api-client</artifactId>

examcloud-core-oe-task-api/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 
 	<artifactId>examcloud-core-oe-task-api</artifactId>

examcloud-core-print-api-client/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 
 	<dependencies>

examcloud-core-print-api/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 
 	<dependencies>

examcloud-core-questions-api-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-questions-api-client</artifactId>
 	<packaging>jar</packaging>

examcloud-core-questions-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-questions-api</artifactId>
 

examcloud-core-reports-api-client/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-reports-api-client</artifactId>
 	<dependencies>

examcloud-core-reports-api/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-reports-api</artifactId>
 	<dependencies>

examcloud-exchange-inner-api-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-exchange-inner-api-client</artifactId>
 

examcloud-exchange-inner-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-exchange-inner-api</artifactId>
 

examcloud-global-api-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-global-api-client</artifactId>
 	<packaging>jar</packaging>

examcloud-global-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-global-api</artifactId>
 

examcloud-task-api-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-task-api-client</artifactId>
 

examcloud-task-api/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-task-api</artifactId>
 

examcloud-ws-api-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 
 	<artifactId>examcloud-ws-api-client</artifactId>

examcloud-ws-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
-		<version>2019-SNAPSHOT</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 
 	<artifactId>examcloud-ws-api</artifactId>

pom.xml

@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
 		<artifactId>examcloud-parent</artifactId>
-		<version>2019</version>
+		<version>v3.0-RELEASE</version>
 	</parent>
 	<groupId>cn.com.qmth.examcloud.rpc</groupId>
 	<artifactId>examcloud-rpc</artifactId>
-	<version>2019-SNAPSHOT</version>
+	<version>v3.0-RELEASE</version>
 	<packaging>pom</packaging>
 
 	<modules>