客户端接口修改

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

@@ -5,6 +5,7 @@ package com.qmth.distributed.print.business.bean.dto;
  */
 public class ClientPrintTaskTotalDto {
 
+    private Integer paperCount;
     private Integer totalSubjects;
     private Integer packageCount;
     private Integer paperPages;
@@ -17,6 +18,16 @@ public class ClientPrintTaskTotalDto {
     private Integer hostCardPages;
     private Integer hostPagesA4;
 
+    private String paperNumberAndType;
+
+    public Integer getPaperCount() {
+        return paperCount;
+    }
+
+    public void setPaperCount(Integer paperCount) {
+        this.paperCount = paperCount;
+    }
+
     public Integer getTotalSubjects() {
         return totalSubjects;
     }
@@ -104,4 +115,12 @@ public class ClientPrintTaskTotalDto {
     public void setHostPagesA4(Integer hostPagesA4) {
         this.hostPagesA4 = hostPagesA4;
     }
+
+    public String getPaperNumberAndType() {
+        return paperNumberAndType;
+    }
+
+    public void setPaperNumberAndType(String paperNumberAndType) {
+        this.paperNumberAndType = paperNumberAndType;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamPrintPlanServiceImpl.java

@@ -421,6 +421,14 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
                 int pagesA4 = list.stream().mapToInt(ClientPrintData::getPagesA4).sum();
                 clientPrintTaskTotalDto.setHostPagesA4(pagesA4 / 2);
             }
+
+            // 试卷总计
+            String paperNumberStrs = clientPrintTaskTotalDto.getPaperNumberAndType();
+            if (StringUtils.isNotBlank(paperNumberStrs)) {
+                String[] paperNumbers = paperNumberStrs.split(",");
+                Set<String> paperNumberSet = new HashSet<>(Arrays.asList(paperNumbers));
+                clientPrintTaskTotalDto.setPaperCount(paperNumberSet.size());
+            }
         }
 
         return clientPrintTaskTotalDto;

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

@@ -333,7 +333,8 @@
             ifnull(sum(ifnull(b.pages_a4, 0)), 0) /2 pagesA4,
             ifnull(sum(case b.status when 'FINISH' then 0 else ifnull(b.paper_pages, 0) end),0)/2 paperPagesLeft,
             ifnull(sum(case b.status when 'FINISH' then 0 else ifnull(b.card_pages, 0) end),0)/2 cardPagesLeft,
-            ifnull(sum(case b.status when 'FINISH' then 0 else ifnull(b.pages_a4, 0) end),0)/2 pagesA4Left
+            ifnull(sum(case b.status when 'FINISH' then 0 else ifnull(b.pages_a4, 0) end),0)/2 pagesA4Left,
+            GROUP_CONCAT(c.paperType) paperNumberAndType
         FROM
             exam_print_plan a
         JOIN
@@ -343,7 +344,7 @@
                 a.exam_detail_id,
                 c.print_plan_id,
                 GROUP_CONCAT(CONCAT(a.course_name, '(', a.course_code, ')')) courseNameCode,
-                GROUP_CONCAT(a.paper_number) paperNumber,
+                GROUP_CONCAT(CONCAT(a.paper_number, ':', a.paper_type)) paperType,
                 GROUP_CONCAT(IFNULL(a.paper_pages_a3, 0) + IFNULL(a.card_pages_a3, 0)) singlePagesA3,
                 SUM(CASE b.is_download
                     WHEN true THEN 0