3.4.2 update

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

@@ -25,6 +25,8 @@ public class ExamTaskApplyPram extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long examTaskId;
 
+    private Boolean openAb;
+
     @ApiModelProperty(value = "命题任务详情")
     private List<ExamTaskDetail> examTaskDetailList;
 
@@ -55,6 +57,14 @@ public class ExamTaskApplyPram extends BaseEntity implements Serializable {
         this.examTaskId = examTaskId;
     }
 
+    public Boolean getOpenAb() {
+        return openAb;
+    }
+
+    public void setOpenAb(Boolean openAb) {
+        this.openAb = openAb;
+    }
+
     public List<ExamTaskDetail> getExamTaskDetailList() {
         return examTaskDetailList;
     }

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

@@ -719,6 +719,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         Optional.ofNullable(examTaskApplyPram.getExamTaskId()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("命题任务ID不能为空"));
         // 更新examTask状态status
         ExamTask examTask = this.getById(examTaskApplyPram.getExamTaskId());
+
         // 提交时，校验
         BasicPrintConfig basicPrintConfig = basicPrintConfigService.getByExamId(examTask.getExamId());
         if (basicPrintConfig == null) {
@@ -741,7 +742,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
         UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda()
-//                .set(ExamTask::getStatus, examTaskDetail.getOperateType())
+                .set(ExamTask::getStatus, ExamStatusEnum.SUBMIT)
+                .set(ExamTask::getOpenAb, examTaskApplyPram.getOpenAb())
                 .set(ExamTask::getUpdateId, sysUser.getId())
                 .set(ExamTask::getUpdateTime, System.currentTimeMillis())
                 .set(ExamTask::getExamTaskContent, examTaskApplyPram.getExamTaskContent())
@@ -752,7 +754,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         // 新建试卷
         List<ExamTaskDetail> examTaskDetailList = examTaskApplyPram.getExamTaskDetailList();
         for (ExamTaskDetail examTaskDetail : examTaskDetailList) {
-            validSubmitParam(examTaskDetail, basicPrintConfig.getPrintContent(), examTask.getOpenAb());
+            validSubmitParam(examTaskDetail, basicPrintConfig.getPrintContent(), examTaskApplyPram.getOpenAb());
             // 已曝光试卷和未曝光试卷赋值（新增时，已曝光试卷为null，未曝光试卷为paper_type）
             examTaskDetail.setId(SystemConstant.getDbUuid());
             examTaskDetail.setUnexposedPaperType(examTaskDetail.getPaperType());

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/PdfUtil.java

@@ -449,7 +449,7 @@ public class PdfUtil {
             throw ExceptionResultEnum.ERROR.exception("试卷文件不存在");
         }
 
-        if (waterMarkName.length == 0) {
+        if (waterMarkName == null || waterMarkName.length == 0) {
             return inputFile;
         }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskApplyController.java

@@ -141,7 +141,7 @@ public class ExamTaskApplyController {
     /**
      * 入库申请-立即申请-提交
      *
-     * @param examTaskDetail 命题任务详情对象
+     * @param examTaskApplyPram 命题任务详情对象
      * @return Result
      */
     @ApiOperation(value = "入库申请-暂存/提交")

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -269,7 +269,7 @@ public class SystemConstant {
     public static final String ID = "id";
     public static final String MODEL = "model";
     public static final String VERSION = "version";
-    public static final String VERSION_VALUE = "3.4.1.1";
+    public static final String VERSION_VALUE = "3.4.2.1";
     public static final String FLOW_ENTITY_ID = "flowEntityId";
     public static final String CUSTOM_FLOW_ID = "customFlowId";
     public static final String ACT_FLOW_ID = "actFlowId";

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

@@ -58,6 +58,8 @@ public class AnswerQueryDomain extends PagerQuery {
 	private String paperType;
 	@ApiModelProperty("卷型检查类型")
 	private PaperTypeCheckStatus paperTypeCheckStatus;
+	@ApiModelProperty("违纪类型（识别违纪：OMR_BREACH，人工指定违纪：MANUAL_BREACH）")
+	private String breachStatus;
 	public Long getExamId() {
 		return examId;
 	}
@@ -238,4 +240,12 @@ public class AnswerQueryDomain extends PagerQuery {
 	public void setPaperTypeCheckStatus(PaperTypeCheckStatus paperTypeCheckStatus) {
 		this.paperTypeCheckStatus = paperTypeCheckStatus;
 	}
+
+	public String getBreachStatus() {
+		return breachStatus;
+	}
+
+	public void setBreachStatus(String breachStatus) {
+		this.breachStatus = breachStatus;
+	}
 }

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

@@ -332,6 +332,14 @@
         <if test="query.paperTypeCheckStatus != null">
             and t.paper_type_check_status=#{query.paperTypeCheckStatus}
         </if>
+        <if test="query.breachStatus != null">
+            <if test="query.breachStatus == 'OMR_BREACH'">
+                t.omr_breach = true
+            </if>
+            <if test="query.breachStatus == 'MANUAL_BREACH'">
+                t.is_breach = true
+            </if>
+        </if>
         <if test="dpr != null and dpr.requestUserId != null">
             AND t.create_id = #{dpr.requestUserId}
         </if>