美术阅卷10月新增需求-新增科组长是否打回选项

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/UserApi.java

@@ -82,6 +82,7 @@ public class UserApi {
         if (!Objects.equals(user.getRole().name(), Role.MARK_LEADER.name())) {
             user.setOneClickLevel(false);
             user.setStandardVolume(false);
+            user.setLevelCallback(false);
         }
         markUserRepo.save(user);
     }
@@ -130,6 +131,7 @@ public class UserApi {
         user.setWorkId(0L);
         user.setOneClickLevel(false);
         user.setStandardVolume(false);
+        user.setLevelCallback(false);
         markUserRepo.save(user);
     }
 

stmms-ms-commons/src/main/java/cn/com/qmth/stmms/ms/commons/constant/ArbitrateCallback.java

@@ -43,7 +43,7 @@ public class ArbitrateCallback {
         List<Distance> result = judge(LEVELS);
         if (Objects.nonNull(result)) {
             resultList = result.stream().map(o -> String.valueOf(o.c)).collect(Collectors.toList());
-            LOGGER.info("LEVELS:{},需要打回的档位为:{}", LEVELS, resultList);
+            LOGGER.info("LEVELS:{},设置的隔档档位为:{},需要打回的档位为:{}", LEVELS, MAX_DISTANCE, resultList);
         }
         return resultList;
     }

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/user/MarkUser.java

@@ -2,7 +2,10 @@ package cn.com.qmth.stmms.ms.core.domain.user;
 
 import cn.com.qmth.stmms.ms.core.vo.Subject;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.validation.constraints.NotNull;
 import java.util.Random;
 
@@ -35,13 +38,23 @@ public class MarkUser extends AbstractUser {
 
     @Column(name = "inspect_sx")
     private Boolean inspectSX;
-    
+
     private Double weight;
 
     private boolean oneClickLevel;
 
     private boolean standardVolume;
 
+    private boolean levelCallback;
+
+    public boolean getLevelCallback() {
+        return levelCallback;
+    }
+
+    public void setLevelCallback(boolean levelCallback) {
+        this.levelCallback = levelCallback;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -144,13 +157,13 @@ public class MarkUser extends AbstractUser {
         this.inspectSX = inspectSX;
     }
 
-	public Double getWeight() {
-		return weight;
-	}
+    public Double getWeight() {
+        return weight;
+    }
 
-	public void setWeight(Double weight) {
-		this.weight = weight;
-	}
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
 
     public boolean getStandardVolume() {
         return standardVolume;