3.3.0 update

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/mark/MarkSettingDto.java

@@ -17,6 +17,9 @@ public class MarkSettingDto {
     private Boolean groupStatus;
     private MarkMode markMode;
     private String markModeDisplay;
+    private String paperType;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long cardId;
 
     public Long getExamId() {
         return examId;
@@ -73,4 +76,20 @@ public class MarkSettingDto {
     public void setMarkModeDisplay(String markModeDisplay) {
         this.markModeDisplay = markModeDisplay;
     }
+
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
+    public Long getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(Long cardId) {
+        this.cardId = cardId;
+    }
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/setting/MarkGroupDto.java

@@ -9,6 +9,7 @@ import java.util.List;
 
 public class MarkGroupDto {
 
+    private Boolean doubleEnable;
     private Integer groupNumber;
     private Double doubleRate;
     private Double arbitrateThreshold;
@@ -18,6 +19,14 @@ public class MarkGroupDto {
     private List<MarkQuestion> questions;
     private String groupQuestions;
 
+    public Boolean getDoubleEnable() {
+        return doubleEnable;
+    }
+
+    public void setDoubleEnable(Boolean doubleEnable) {
+        this.doubleEnable = doubleEnable;
+    }
+
     public Integer getGroupNumber() {
         return groupNumber;
     }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkGroup.java

@@ -55,6 +55,11 @@ public class MarkGroup implements Serializable {
     @ApiModelProperty(value = "满分")
     private Double totalScore;
 
+
+    @ApiModelProperty(value = "是否开启双评")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Boolean doubleEnable;
+
     @ApiModelProperty(value = "双评比例")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Double doubleRate;
@@ -164,6 +169,14 @@ public class MarkGroup implements Serializable {
         this.totalScore = totalScore;
     }
 
+    public Boolean getDoubleEnable() {
+        return doubleEnable;
+    }
+
+    public void setDoubleEnable(Boolean doubleEnable) {
+        this.doubleEnable = doubleEnable;
+    }
+
     public Double getDoubleRate() {
         return doubleRate;
     }

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

@@ -16,7 +16,7 @@ import com.qmth.teachcloud.mark.service.FileService;
 @Service
 public class FileServiceImpl implements FileService {
 
-	@Autowired
+//	@Autowired
 	private FileStore fileStore;
 
 	@Override

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

@@ -69,6 +69,7 @@ public class MarkGroupServiceImpl extends ServiceImpl<MarkGroupMapper, MarkGroup
             for (MarkGroup markGroup : groupList) {
                 MarkGroupDto markGroupDto = new MarkGroupDto();
                 markGroupDto.setGroupNumber(markGroup.getNumber());
+                markGroupDto.setDoubleEnable(markGroup.getDoubleEnable());
                 markGroupDto.setDoubleRate(markGroup.getDoubleRate());
                 markGroupDto.setArbitrateThreshold(markGroup.getArbitrateThreshold());
                 markGroupDto.setScorePolicy(markGroup.getScorePolicy());
@@ -258,15 +259,15 @@ public class MarkGroupServiceImpl extends ServiceImpl<MarkGroupMapper, MarkGroup
         markGroup.setPicList(JSON.toJSONString(markGroupDto.getPictureConfigs()));
         Double totalScore = questions.stream().collect(Collectors.summingDouble(MarkQuestion::getTotalScore));
         markGroup.setTotalScore(totalScore);
-        if (markGroupDto.getDoubleRate() != null || markGroupDto.getArbitrateThreshold() != null || markGroupDto.getScorePolicy() != null) {
+        if (markGroupDto.getDoubleEnable()) {
             if (markGroupDto.getDoubleRate() == null) {
                 throw ExceptionResultEnum.ERROR.exception("开启双评，双评比例必填");
             }
             if (markGroupDto.getArbitrateThreshold() == null) {
-                throw ExceptionResultEnum.ERROR.exception("开启双评， 仲裁阀值必填");
+                throw ExceptionResultEnum.ERROR.exception("开启双评，仲裁阀值必填");
             }
             if (markGroupDto.getScorePolicy() == null) {
-                throw ExceptionResultEnum.ERROR.exception("开启双评， 合分规则必填");
+                throw ExceptionResultEnum.ERROR.exception("开启双评，合分规则必填");
             }
         }
         markGroup.setDoubleRate(markGroupDto.getDoubleRate());
@@ -321,7 +322,7 @@ public class MarkGroupServiceImpl extends ServiceImpl<MarkGroupMapper, MarkGroup
         if (markGroup == null) {
             throw ExceptionResultEnum.ERROR.exception("数据不存在");
         }
-        if (markGroupDto.getDoubleRate() != null || markGroupDto.getArbitrateThreshold() != null || markGroupDto.getScorePolicy() != null) {
+        if (markGroupDto.getDoubleEnable()) {
             if (markGroupDto.getDoubleRate() == null) {
                 throw ExceptionResultEnum.ERROR.exception("开启双评，双评比例必填");
             } else if (markGroupDto.getDoubleRate() < markGroup.getDoubleRate()) {