deason hace 1 año
padre
commit
9390ce5027

+ 24 - 16
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/OnHandExamInfo.java

@@ -62,9 +62,9 @@ public class OnHandExamInfo implements JsonSerializable {
     private String examStatus;
 
     /**
-     * 是否有效
+     * 当前考生-是否跳过人脸识别
      */
-    //private Boolean isvalid;
+    private Boolean skipFace;
 
     /**
      * 是否启用人脸识别
@@ -91,9 +91,9 @@ public class OnHandExamInfo implements JsonSerializable {
     private JSONArray examCycleWeek;
 
     private JSONArray examCycleTimeRange;
-    
+
     private Boolean showUndertaking;
-    
+
     private String undertaking;
 
     public String getStudentName() {
@@ -289,6 +289,14 @@ public class OnHandExamInfo implements JsonSerializable {
         this.rootOrgId = rootOrgId;
     }
 
+    public Boolean getSkipFace() {
+        return skipFace;
+    }
+
+    public void setSkipFace(Boolean skipFace) {
+        this.skipFace = skipFace;
+    }
+
     public Boolean getFaceEnable() {
         return faceEnable;
     }
@@ -345,21 +353,21 @@ public class OnHandExamInfo implements JsonSerializable {
         this.examCycleTimeRange = examCycleTimeRange;
     }
 
-	public Boolean getShowUndertaking() {
-		return showUndertaking;
-	}
+    public Boolean getShowUndertaking() {
+        return showUndertaking;
+    }
 
-	public void setShowUndertaking(Boolean showUndertaking) {
-		this.showUndertaking = showUndertaking;
-	}
+    public void setShowUndertaking(Boolean showUndertaking) {
+        this.showUndertaking = showUndertaking;
+    }
 
-	public String getUndertaking() {
-		return undertaking;
-	}
+    public String getUndertaking() {
+        return undertaking;
+    }
 
-	public void setUndertaking(String undertaking) {
-		this.undertaking = undertaking;
-	}
+    public void setUndertaking(String undertaking) {
+        this.undertaking = undertaking;
+    }
 
 
 }

+ 8 - 0
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamStudentServiceImpl.java

@@ -1226,6 +1226,12 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         }
 
         for (OnHandExamInfo info : examStudentDtoList) {
+            if (ExamType.ONLINE == examType) {
+                // 当前考生-是否跳过人脸识别
+                info.setSkipFace(true);
+                //todo
+            }
+
             ExamPropertyCacheBean examCycleEnabledCache = CacheHelper.getExamProperty(info.getExamId(),
                     ExamProperties.EXAM_CYCLE_ENABLED.name());
             if (examCycleEnabledCache != null && StringUtil.isTrue(examCycleEnabledCache.getValue())) {
@@ -1324,6 +1330,8 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         examStudentInfo.setEndTime(examBean.getEndTime());// 考试结束时间设置
         examStudentInfo.setAllowExamCount(countExamTimes(examStudent, examBean));
         examStudentInfo.setPaperMins(examBean.getDuration());
+        // 当前考生-是否跳过人脸识别
+        examStudentInfo.setSkipFace(false);
         // 是否启用人脸识别
         examStudentInfo.setFaceEnable(FaceBiopsyHelper.isFaceEnable(rootOrgId, examId, studentId));
         // 进入考试是否验证人脸识别(强制、非强制)