撤销BUG修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDto.java

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.bean.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.enums.FlowJoinTypeEnum;
 import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
 import com.qmth.teachcloud.common.enums.ExamModelEnum;
 import com.qmth.teachcloud.common.enums.FlowStatusEnum;
@@ -64,6 +65,28 @@ public class ExamTaskDto {
     @ApiModelProperty(value = "考试模式")
     private ExamModelEnum examModel;
 
+    @ApiModelProperty(value = "审批次数")
+    private Integer approveCount;
+
+    @ApiModelProperty(value = "流程类型")
+    private FlowJoinTypeEnum flowType;
+
+    public Integer getApproveCount() {
+        return approveCount;
+    }
+
+    public void setApproveCount(Integer approveCount) {
+        this.approveCount = approveCount;
+    }
+
+    public FlowJoinTypeEnum getFlowType() {
+        return flowType;
+    }
+
+    public void setFlowType(FlowJoinTypeEnum flowType) {
+        this.flowType = flowType;
+    }
+
     public Boolean getApproveFormStatus() {
         return approveFormStatus;
     }

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -200,7 +200,9 @@
             f.name examName,
             f.semester_id semesterId,
             f.exam_model examModel,
-            g.name semesterName
+            g.name semesterName,
+            (select count(1) from t_f_flow_log tffl where tffl.flow_id = e.flow_id and tffl.approve_operation <![CDATA[ <> ]]> 'EXCHANGE') as approveCount,
+            tffj.type as flowType
         FROM
             exam_task a
         LEFT JOIN
@@ -215,6 +217,7 @@
             basic_exam f on a.school_id = f.school_id and a.exam_id = f.id
         LEFT JOIN
             basic_semester g on f.school_id = g.school_id and f.semester_id = g.id
+        LEFT JOIN t_f_flow_join tffj on tffj.flow_id = e.flow_id
         <where>
             a.enable = true
             <if test="userId != null and userId != ''">