3.4.2 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ExamTaskSubmitPram.java

@@ -43,6 +43,12 @@ public class ExamTaskSubmitPram extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private List<Long> approveUserIds;
 
+    @ApiModelProperty(value = "附件")
+    private String paperConfirmAttachmentIds;
+
+    @ApiModelProperty(value = "附件说明")
+    private String remark;
+
     @ApiModelProperty(value = "自定义流程id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(exist = false)
@@ -103,4 +109,20 @@ public class ExamTaskSubmitPram extends BaseEntity implements Serializable {
     public void setExamTaskContent(String examTaskContent) {
         this.examTaskContent = examTaskContent;
     }
+
+    public String getPaperConfirmAttachmentIds() {
+        return paperConfirmAttachmentIds;
+    }
+
+    public void setPaperConfirmAttachmentIds(String paperConfirmAttachmentIds) {
+        this.paperConfirmAttachmentIds = paperConfirmAttachmentIds;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1260,6 +1260,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setUserId(sysUser.getId());
             examTask.setStatus(ExamStatusEnum.SUBMIT);
             examTask.setSource(ExamTaskSourceEnum.SELF);
+            examTask.setPaperConfirmAttachmentIds(examTaskSubmitPram.getPaperConfirmAttachmentIds());
+            examTask.setRemark(examTaskSubmitPram.getRemark());
             examTask.insertInfo(sysUser.getId());
             examTask.setExamTaskContent(examTaskSubmitPram.getExamTaskContent());
 
@@ -1306,7 +1308,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 List<Long> cardIds = paperInfoVoList.stream().filter(m -> StringUtils.isNotBlank(m.getCardId())).map(m -> Long.parseLong(m.getCardId())).collect(Collectors.toList());
                 for (Long cardId : cardIds) {
                     ExamCard examCard = examCardService.getById(cardId);
-                    if(examTask.getOpenAb().equals(examCard.getOpenAb())){
+                    if(!examTask.getOpenAb().equals(examCard.getOpenAb())){
                         throw ExceptionResultEnum.ERROR.exception(examTask.getOpenAb() && !examCard.getOpenAb() ? "命题任务开启了AB卷，请选择AB卷题卡或者编辑题卡开启AB卷": "命题任务未开启了AB卷，请选择单题卡或者编辑题卡关闭AB卷");
                     }
                 }