发布的不显示删除

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

@@ -50,6 +50,9 @@ public class GradeBatchResult {
     @ApiModelProperty(value = "教研分析学期id")
     private Long thirdSemesterId;
 
+    @ApiModelProperty(value = "发布状态")
+    private Boolean publishStatus;
+
     public Long getId() {
         return id;
     }
@@ -137,4 +140,12 @@ public class GradeBatchResult {
     public void setThirdSemesterId(Long thirdSemesterId) {
         this.thirdSemesterId = thirdSemesterId;
     }
+
+    public Boolean getPublishStatus() {
+        return publishStatus;
+    }
+
+    public void setPublishStatus(Boolean publishStatus) {
+        this.publishStatus = publishStatus;
+    }
 }

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

@@ -15,10 +15,17 @@
             gb.report_file_path AS reportFilePath,
             gb.notify_time AS notifyTime,
             gb.result AS result,
-            gb.third_semester_id AS thirdSemesterId
+            gb.third_semester_id AS thirdSemesterId,
+            gbp.publish_status AS publishStatus
         FROM
             grade_batch gb
-        LEFT JOIN
+                INNER JOIN
+            (SELECT
+                 batch_id, MAX(publish_status) AS publish_status
+             FROM
+                 grade_batch_paper
+             GROUP BY batch_id) gbp ON gb.id = gbp.batch_id
+                LEFT JOIN
             basic_semester bs ON gb.semester_id = bs.id
         <where>
             <if test="schoolId != null and schoolId != ''">

distributed-print/src/test/java/com/qmth/distributed/print/BasicDataImportTest.java

@@ -1,6 +1,7 @@
 package com.qmth.distributed.print;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qmth.distributed.print.business.util.PdfUtil;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
@@ -16,8 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.annotation.Resource;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -43,6 +46,8 @@ public class BasicDataImportTest {
     private SysUserRoleService sysUserRoleService;
     @Autowired
     private SysRolePrivilegeService sysRolePrivilegeService;
+    @Resource
+    private PdfUtil pdfUtil;
 
     // 学校Id
     private Long schoolId = 1l;
@@ -258,4 +263,21 @@ public class BasicDataImportTest {
         }
     }
 
+    @Test
+    public void file(){
+        File file1 = new File("E:\\file\\基础和声1.pdf");
+        try {
+            PdfUtil.getPdfFormat(file1);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        File file2 = new File("E:\\file\\1.pdf");
+        try {
+            PdfUtil.getPdfFormat(file2);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
 }