加入任务管理查询

sop-business/src/main/java/com/qmth/sop/business/bean/result/TaskListResult.java

@@ -8,6 +8,7 @@ import com.qmth.sop.common.enums.TaskTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * @Description: 任务列表result
@@ -23,13 +24,13 @@ public class TaskListResult implements Serializable {
     Long id;
 
     @ApiModelProperty(value = "任务类型")
-    TaskTypeEnum type;
+    String type;
 
     @ApiModelProperty(value = "任务状态，INIT：未开始，RUNNING：进行中，FINISH：已完成")
-    TaskStatusEnum status;
+    String status;
 
     @ApiModelProperty(value = "数据结果，SUCCESS：成功，ERROR：失败")
-    TaskResultEnum result;
+    String result;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "创建人id")
@@ -50,28 +51,6 @@ public class TaskListResult implements Serializable {
     @ApiModelProperty(value = "是否有报告文件")
     Boolean hasReportFile;
 
-    @ApiModelProperty(value = "重新生成次数")
-    int resetCount;
-
-    @ApiModelProperty(value = "人工错误原因")
-    String errorMessage;
-
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    public void setErrorMessage(String errorMessage) {
-        this.errorMessage = errorMessage;
-    }
-
-    public int getResetCount() {
-        return resetCount;
-    }
-
-    public void setResetCount(int resetCount) {
-        this.resetCount = resetCount;
-    }
-
     public Long getId() {
         return id;
     }
@@ -80,27 +59,27 @@ public class TaskListResult implements Serializable {
         this.id = id;
     }
 
-    public TaskTypeEnum getType() {
-        return type;
+    public String getType() {
+        return TaskTypeEnum.valueOf(type).getTitle();
     }
 
-    public void setType(TaskTypeEnum type) {
+    public void setType(String type) {
         this.type = type;
     }
 
-    public TaskStatusEnum getStatus() {
-        return status;
+    public String getStatus() {
+        return Objects.nonNull(status) ? TaskStatusEnum.valueOf(status).getTitle() : status;
     }
 
-    public void setStatus(TaskStatusEnum status) {
+    public void setStatus(String status) {
         this.status = status;
     }
 
-    public TaskResultEnum getResult() {
-        return result;
+    public String getResult() {
+        return Objects.nonNull(result) ? TaskResultEnum.valueOf(result).getTitle() : null;
     }
 
-    public void setResult(TaskResultEnum result) {
+    public void setResult(String result) {
         this.result = result;
     }
 

sop-business/src/main/resources/mapper/TBTaskMapper.xml

@@ -13,9 +13,7 @@
         su.real_name as createName,
         if(ISNULL(tbt.import_file_path),false,true) as hasImportFile,
         IF(tbt.result_file_path is null, IF(tbt.import_file_path is null, false, true), true) as hasResultFile,
-        if(ISNULL(tbt.report_file_path),false,true) as hasReportFile,
-        tbt.reset_count as resetCount,
-        tbt.error_message as errorMessage
+        if(ISNULL(tbt.report_file_path),false,true) as hasReportFile
         from t_b_task tbt
         left join sys_user su on su.id = tbt.create_id
         <where>