Merge remote-tracking branch 'origin/dev' into dev

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

@@ -24,24 +24,11 @@ public class TaskListResult implements Serializable {
     Long id;
 
     @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学校id")
-    Long schoolId;
-
-    @ApiModelProperty(value = "学校代码")
-    String schoolCode;
+    @ApiModelProperty(value = "印刷计划id")
+    Long printPlanId;
 
     @ApiModelProperty(value = "学校名称")
-    String schoolName;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "项目id")
-    Long projectId;
-
-    @ApiModelProperty(value = "项目代码")
-    String projectCode;
-
-    @ApiModelProperty(value = "项目名称")
-    String projectName;
+    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;
@@ -76,52 +63,20 @@ public class TaskListResult implements Serializable {
         this.id = id;
     }
 
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getSchoolCode() {
-        return schoolCode;
-    }
-
-    public void setSchoolCode(String schoolCode) {
-        this.schoolCode = schoolCode;
-    }
-
-    public String getSchoolName() {
-        return schoolName;
-    }
-
-    public void setSchoolName(String schoolName) {
-        this.schoolName = schoolName;
-    }
-
-    public Long getProjectId() {
-        return projectId;
-    }
-
-    public void setProjectId(Long projectId) {
-        this.projectId = projectId;
-    }
-
-    public String getProjectCode() {
-        return projectCode;
+    public Long getPrintPlanId() {
+        return printPlanId;
     }
 
-    public void setProjectCode(String projectCode) {
-        this.projectCode = projectCode;
+    public void setPrintPlanId(Long printPlanId) {
+        this.printPlanId = printPlanId;
     }
 
-    public String getProjectName() {
-        return projectName;
+    public String getPrintPlanName() {
+        return printPlanName;
     }
 
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
+    public void setPrintPlanName(String printPlanName) {
+        this.printPlanName = printPlanName;
     }
 
     public String getType() {

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

@@ -5,12 +5,8 @@
     <select id="query" resultType="com.qmth.distributed.print.business.bean.result.TaskListResult">
         select
             tbt.id,
-            tbt.school_id as schoolId,
-            tbs.code as schoolCode,
-            tbs.name as schoolName,
-            tbt.org_id as orgId,
-            so.code as orgCode,
-            so.name as orgName,
+            tbt.print_plan_id as printPlanId,
+            epp.name as printPlanName,
             tbt.`type`,
             tbt.status,
             tbt.`result`,
@@ -18,19 +14,17 @@
             tbt.create_id as createId,
             (
             select
-                t.name
+            t.real_name
             from
-                t_b_user t
+            sys_user t
             where
-                t.id = tbt.create_id) as createName,
+            t.id = tbt.create_id) as createName,
             if(ISNULL(tbt.result_file_path),false,true) as hasResultFile,
             if(ISNULL(tbt.report_file_path),false,true) as hasReportFile
-        from
+            from
             t_b_task tbt
-        left join t_b_school tbs on
-            tbs.id = tbt.school_id
-        left join sys_org so on
-            so.id = tbt.org_id
+            left join exam_print_plan epp on
+            epp.id = tbt.print_plan_id
             <where>
                 <if test="printPlanId != null and printPlanId != ''">
                     and tbt.print_plan_id = #{printPlanId}

distributed-print-common/src/main/java/com/qmth/distributed/print/common/util/ResultUtil.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.common.util;
 
+import cn.hutool.http.HttpStatus;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
@@ -60,6 +61,6 @@ public class ResultUtil {
     }
 
     public static Result ok() {
-        return new Result(ExceptionResultEnum.SUCCESS.getStatus().value());
+        return new Result(HttpStatus.HTTP_OK, Collections.singletonMap(SystemConstant.UPDATE_TIME, System.currentTimeMillis()), ExceptionResultEnum.SUCCESS.getMessage());
     }
 }