3.3.0 fix

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/scananswer/AnswerQueryDomain.java

@@ -38,6 +38,7 @@ public class AnswerQueryDomain extends PagerQuery {
     private Boolean absentSuspect;
 
     private Boolean omrAbsent;
+    private Boolean omrAbsentChecked;
 
     private Boolean assigned;
     private Boolean assignConfirmed;
@@ -128,6 +129,15 @@ public class AnswerQueryDomain extends PagerQuery {
 	public void setOmrAbsent(Boolean omrAbsent) {
 		this.omrAbsent = omrAbsent;
 	}
+
+	public Boolean getOmrAbsentChecked() {
+		return omrAbsentChecked;
+	}
+
+	public void setOmrAbsentChecked(Boolean omrAbsentChecked) {
+		this.omrAbsentChecked = omrAbsentChecked;
+	}
+
 	public Boolean getAssigned() {
 		return assigned;
 	}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkServiceImpl.java

@@ -432,16 +432,16 @@ public class MarkServiceImpl implements MarkService {
                     // 开启双评时需要判断是否生成第二份评卷任务
                     if (group.getDoubleEnable() != null && group.getDoubleEnable()) {
                         boolean needDouble;
-                        if (group.getDoubleRate() == 1) {
+                        if (group.getDoubleRate() == 100) {
                             needDouble = true;
                         } else {
                             double libraryCount = taskList.size();
-                            int expectCount = (int) (studentCount * group.getDoubleRate());
+                            int expectCount = (int) (studentCount * group.getDoubleRate() / 100);
                             // 随机数判断加入当前已经生成双评任务的比例加权
                             // 实际双评任务数小于理论生成数 &&（剩余未生成双评的考生数量小于剩余应生成的数量||随机比例）
                             needDouble = doubleCount < expectCount
                                     && ((studentCount - libraryCount + doubleCount) <= (expectCount - doubleCount)
-                                    || Math.random() < group.getDoubleRate() + 0.1);
+                                    || Math.random() < group.getDoubleRate() / 100 + 0.1);
                         }
                         if (needDouble) {
                             markTask = new MarkTask();

teachcloud-mark/src/main/resources/mapper/MarkStudentMapper.xml

@@ -213,6 +213,9 @@
         <if test="query.omrAbsent != null">
             and t.omr_absent=#{query.omrAbsent}
         </if>
+        <if test="query.omrAbsentChecked != null">
+            and t.omr_absent_checked=#{query.omrAbsentChecked}
+        </if>
         <if test="query.assigned != null">
             and t.assigned=#{query.assigned}
         </if>