3.3.0 update

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/TaskListResult.java

@@ -21,81 +21,83 @@ public class TaskListResult implements Serializable {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "id")
-    Long id;
+    private Long id;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "学期ID")
-    Long semesterId;
+    private Long semesterId;
 
     @ApiModelProperty(value = "学期名称")
-    String semesterName;
+    private String semesterName;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "考试ID")
-    Long examId;
+    private Long examId;
 
     @ApiModelProperty(value = "考试名称")
-    String examName;
+    private String examName;
 
     @ApiModelProperty(value = "课程代码")
-    String courseCode;
+    private String courseCode;
 
     @ApiModelProperty(value = "课程名称")
-    String courseName;
+    private String courseName;
 
     @ApiModelProperty(value = "试卷编号")
-    String paperNumber;
+    private String paperNumber;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "印刷计划id")
-    Long printPlanId;
+    private Long printPlanId;
 
     @ApiModelProperty(value = "学校名称")
-    String printPlanName;
+    private String printPlanName;
 
     @ApiModelProperty(value = "任务类型，IMPORT_STUDENT_PHOTO：照片导入，EXPORT_STUDENT_PHOTO：照片导出，IMPORT_EXAM_STUDENT：考生导入，EXPORT_EXAM_STUDENT：考生导出，IMPORT_BATCH_PAPER：试卷批量导入，EXPORT_BATCH_PAPER：试卷批量导出，IMPORT_CUSTOM_TEMPLATE：模版批量导入，EXPORT_CUSTOM_TEMPLATE：模版批量导出，DOWNLOAD_BOX_STICKER：箱贴下载")
-    String type;
+    private String type;
 
     @ApiModelProperty(value = "任务状态，INIT：未开始，RUNNING：进行中，FINISH：已完成")
-    String status;
+    private String status;
 
     @ApiModelProperty(value = "数据结果，SUCCESS：成功，ERROR：失败")
-    String result;
+    private String result;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "创建人id")
-    Long createId;
+    private Long createId;
 
     @ApiModelProperty(value = "创建人")
-    String createName;
+    private String createName;
 
     @ApiModelProperty(value = "创建时间")
-    Long createTime;
+    private Long createTime;
 
     @ApiModelProperty(value = "下载文件类型")
     private String downloadType;
 
     @ApiModelProperty(value = "是否有导入文件")
-    Boolean hasImportFile;
+    private Boolean hasImportFile;
 
     @ApiModelProperty(value = "是否有导出文件")
-    Boolean hasResultFile;
+    private Boolean hasResultFile;
 
     @ApiModelProperty(value = "是否有报告文件")
-    Boolean hasReportFile;
+    private Boolean hasReportFile;
 
     @ApiModelProperty(value = "是否有错误文件")
-    Boolean hasErrorFile;
+    private Boolean hasErrorFile;
 
     @ApiModelProperty(value = "是否重新生成pdf")
-    boolean resetCreatePdf;
+    private boolean resetCreatePdf;
 
     @ApiModelProperty(value = "重新生成次数")
-    int resetCount;
+    private int resetCount;
 
     @ApiModelProperty(value = "人工错误原因")
-    String errorMessage;
+    private String errorMessage;
 
+    @ApiModelProperty(value = "重新生成次数")
+    private String summary;
 
     public Long getSemesterId() {
         return semesterId;
@@ -289,4 +291,12 @@ public class TaskListResult implements Serializable {
     public void setHasErrorFile(Boolean hasErrorFile) {
         this.hasErrorFile = hasErrorFile;
     }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
 }

teachcloud-common/src/main/resources/mapper/TBTaskMapper.xml

@@ -4,32 +4,33 @@
 
     <select id="query" resultType="com.qmth.teachcloud.common.bean.result.TaskListResult">
         select
-        tbt.id,
-        tbt.semester_id semesterId,
-        bs.name semesterName,
-        tbt.exam_id examId,
-        be.name examName,
-        tbt.course_code courseCode,
-        tbt.course_name courseName,
-        tbt.paper_number paperNumber,
-        tbt.print_plan_id as printPlanId,
-        concat_ws('-', epp.name, tbt.obj_name) as printPlanName,
-        tbt.`type`,
-        tbt.status,
-        tbt.`result`,
-        tbt.create_time as createTime,
-        tbt.create_id as createId,
-        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,
-        if(ISNULL(tbt.error_file_path),false,true) as hasErrorFile,
-        tbt.reset_count as resetCount,
-        tbt.error_message as errorMessage
+            tbt.id,
+            tbt.semester_id semesterId,
+            bs.name semesterName,
+            tbt.exam_id examId,
+            be.name examName,
+            tbt.course_code courseCode,
+            tbt.course_name courseName,
+            tbt.paper_number paperNumber,
+            tbt.print_plan_id as printPlanId,
+            concat_ws('-', epp.name, tbt.obj_name) as printPlanName,
+            tbt.`type`,
+            tbt.status,
+            tbt.`result`,
+            tbt.create_time as createTime,
+            tbt.create_id as createId,
+            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,
+            if(ISNULL(tbt.error_file_path),false,true) as hasErrorFile,
+            tbt.reset_count as resetCount,
+            tbt.error_message as errorMessage,
+            tbt.summary
         from
-        t_b_task tbt
+            t_b_task tbt
         left join exam_print_plan epp on
-        epp.id = tbt.print_plan_id
+            epp.id = tbt.print_plan_id
         left join sys_user su on su.id = tbt.create_id
         left join basic_semester bs on tbt.semester_id = bs.id
         left join basic_exam be on tbt.exam_id = be.id