3.2.7 bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTaskDetail.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -74,7 +75,7 @@ public class ExamTaskDetail extends BaseEntity implements Serializable {
     /**
      * 曝光卷型：已打印卷型，多个以”/“分隔，如A/B/C/D
      */
-    @TableField("exposed_paper_type")
+    @TableField(value = "exposed_paper_type", updateStrategy = FieldStrategy.IGNORED)
     private String exposedPaperType;
 
     @TableField("relate_paper_type")

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

@@ -500,7 +500,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
                 }
                 exposedPaperTypeList.sort(Comparator.comparing(String::toString));
                 unexposedPaperTypeList.sort(Comparator.comparing(String::toString));
-                taskDetail.setExposedPaperType(String.join(",", exposedPaperTypeList));
+                taskDetail.setExposedPaperType(CollectionUtils.isEmpty(exposedPaperTypeList) ? null : String.join(",", exposedPaperTypeList));
                 taskDetail.setUnexposedPaperType(String.join(",", unexposedPaperTypeList));
                 taskDetail.setRelatePaperType(null);
                 this.updateById(taskDetail);
@@ -516,7 +516,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
         }
 
         // 不需要审核，直接更新，否则加入待审核列表(状态为不需要审核的或者为管理员身份的都不重新走审核流程)
-        if ((Objects.nonNull(examTask.getReview()) && examTask.getReview()) || !sysUserService.isAdminDataAuth(requestUser.getId())) {
+        if ((Objects.nonNull(examTask.getReview()) && examTask.getReview())) {
             // 发起新流程
             Map<String, Object> map = SystemConstant.buildFlowVar(examTask.getId(),
                     examTask,

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

@@ -801,7 +801,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
 
         Map<String, Object> map = new HashMap<>();
-        if (ExamStatusEnum.SUBMIT.name().equals(examTaskDetail.getOperateType())) {
+        if (ExamStatusEnum.SUBMIT.name().equals(examTaskDetail.getOperateType()) && examTask.getReview()) {
             // 审核一级
             Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(examTask.getFlowId())).singleResult();
             if (Objects.nonNull(task)) {

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

@@ -161,10 +161,10 @@ public class ExamTaskApplyController {
     public Result taskApplySave(@RequestBody ExamTaskDetail examTaskDetail) throws IOException {
         Map<String, Object> map = examTaskService.saveExamTaskDetail(examTaskDetail);
         ExamTask examTask = examTaskService.getById(examTaskDetail.getExamTaskId());
-        /*if (examTaskDetail.getOperateType().equals(ExamStatusEnum.SUBMIT.name()) && (Objects.nonNull(examTask.getReview()) && !examTask.getReview())) {
+        if (examTaskDetail.getOperateType().equals(ExamStatusEnum.SUBMIT.name()) && (Objects.nonNull(examTask.getReview()) && !examTask.getReview())) {
             // 校验是否可以提交打印状态
             printCommonService.checkData(examTask.getSchoolId(), examTask.getExamId(), examTask.getCourseCode(), examTask.getPaperNumber(), (SysUser) ServletUtil.getRequestUser());
-        }*/
+        }
         Boolean sendFlowMq = (Boolean) map.get(SystemConstant.SEND_FLOW_MQ);
         if (Objects.nonNull(sendFlowMq) && sendFlowMq) {
             activitiService.sendFlowTaskApproveMsg(map);