流程数据修改

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

@@ -1,8 +1,11 @@
 package com.qmth.distributed.print.business.bean.dto;
 
+import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
+import com.qmth.teachcloud.common.enums.FlowStatusEnum;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Date: 2021/3/31.
@@ -20,7 +23,7 @@ public class ExamTaskDto {
     private String userName;
     private Long startTime;
     private Long endTime;
-    private String status;
+    private ExamStatusEnum status;
     private Boolean enable;
     private String createId;
     private String createName;
@@ -32,9 +35,43 @@ public class ExamTaskDto {
     private String teachingRoomName;
     private String flowId;
     private Integer setup;
-
+    private FlowStatusEnum flowStatus;
+    private String flowStatusStr;
+    private String statusStr;
     private List<BlurryUserDto> users;
 
+    public FlowStatusEnum getFlowStatus() {
+        return flowStatus;
+    }
+
+    public void setFlowStatus(FlowStatusEnum flowStatus) {
+        this.flowStatus = flowStatus;
+    }
+
+    public String getFlowStatusStr() {
+        if (Objects.nonNull(flowStatus)) {
+            return flowStatus.getTitle();
+        } else {
+            return flowStatusStr;
+        }
+    }
+
+    public void setFlowStatusStr(String flowStatusStr) {
+        this.flowStatusStr = flowStatusStr;
+    }
+
+    public String getStatusStr() {
+        if (Objects.nonNull(status)) {
+            return status.getDesc();
+        } else {
+            return statusStr;
+        }
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
+
     public String getId() {
         return id;
     }
@@ -123,11 +160,11 @@ public class ExamTaskDto {
         this.endTime = endTime;
     }
 
-    public String getStatus() {
+    public ExamStatusEnum getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(ExamStatusEnum status) {
         this.status = status;
     }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/ExamStatusEnum.java

@@ -12,7 +12,7 @@ import java.util.List;
  */
 public enum ExamStatusEnum {
 
-    DRAFT("草稿"),
+    DRAFT("新建"),
     STAGE("待命题"),
     SUBMIT("已提交");
 

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

@@ -235,15 +235,7 @@
             a.status,
             a.flow_id flowId,
             f.setup,
-            CASE
-                WHEN a.review = 1 AND a.status = 'SUBMIT' THEN 'NOT_AUDITED'
-                WHEN a.review = 1 AND a.status IN ('STAGE', 'FINISH') AND a.review_status IS NOT NULL THEN 'AUDITED'
-                ELSE ''
-            END auditStatus,
-            CASE
-                WHEN a.review_status IS NULL THEN ''
-                ELSE a.review_status
-            END reviewStatus
+            f.status as flowStatus
         FROM
             exam_task a
         LEFT JOIN
@@ -259,7 +251,7 @@
         <where>
             a.enable = true
             AND a.review = true
-            AND f.status != 'FINISH'
+            AND f.status = 'AUDITING' or f.status = 'REJECT'
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>
@@ -301,7 +293,7 @@
     </select>
     <select id="listTaskReviewAudited" resultType="com.qmth.distributed.print.business.bean.dto.ExamTaskDto">
         SELECT
-        a.id,
+        distinct a.id,
         a.school_id schoolId,
         a.course_code courseCode,
         a.course_name courseName,
@@ -319,15 +311,9 @@
         a.create_id createId,
         a.create_time createTime,
         a.status,
-        CASE
-        WHEN a.review = 1 AND a.status = 'SUBMIT' THEN 'NOT_AUDITED'
-        WHEN a.review = 1 AND a.status IN ('STAGE', 'FINISH') AND a.review_status IS NOT NULL THEN 'AUDITED'
-        ELSE ''
-        END auditStatus,
-        CASE
-        WHEN a.review_status IS NULL THEN ''
-        ELSE a.review_status
-        END reviewStatus
+        a.flow_id flowId,
+        f.setup,
+        f.status as flowStatus
         FROM
         exam_task a
         LEFT JOIN
@@ -336,6 +322,10 @@
         sys_user c ON a.user_id = c.id
         LEFT JOIN
         sys_user d ON a.create_id = d.id
+        LEFT JOIN t_f_flow_approve f ON
+        a.flow_id = f.flow_id
+        LEFT JOIN t_f_flow_approve_log tffal ON
+        a.flow_id = tffal.flow_id
         <where>
             a.enable = true and a.review = true and a.status in ('STAGE','FINISH') and a.review_status is not null
             <if test="schoolId != null and schoolId != ''">
@@ -351,7 +341,7 @@
                 and a.paper_number = #{paperNumber}
             </if>
             <if test="userId != null and userId != ''">
-                and a.user_id = #{userId}
+                and (tffal.primary_approve_id = #{userId} or tffal.second_approve_id = #{userId})
             </if>
             <if test="cardRuleId != null and cardRuleId != ''">
                 and a.card_rule_id = #{cardRuleId}