3.2.0-bug

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

@@ -15,7 +15,8 @@ public class ClientPrintStatisticsDto {
     private Integer packageCount;
     private Integer totalSubjects;
     private Integer totalSubjectsLeft;
-    private Integer pagesA3Left;
+    private Integer paperPagesLeft;
+    private Integer cardPagesLeft;
     private Integer pagesA4Left;
     private Integer progress;
 
@@ -99,12 +100,20 @@ public class ClientPrintStatisticsDto {
         this.totalSubjectsLeft = totalSubjectsLeft;
     }
 
-    public Integer getPagesA3Left() {
-        return pagesA3Left;
+    public Integer getPaperPagesLeft() {
+        return paperPagesLeft;
     }
 
-    public void setPagesA3Left(Integer pagesA3Left) {
-        this.pagesA3Left = pagesA3Left;
+    public void setPaperPagesLeft(Integer paperPagesLeft) {
+        this.paperPagesLeft = paperPagesLeft;
+    }
+
+    public Integer getCardPagesLeft() {
+        return cardPagesLeft;
+    }
+
+    public void setCardPagesLeft(Integer cardPagesLeft) {
+        this.cardPagesLeft = cardPagesLeft;
     }
 
     public Integer getPagesA4Left() {

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

@@ -9,9 +9,11 @@ public class ClientPrintStatisticsTotalDto {
     private Integer packageCount;
     private Integer paperCount;
     private String paperNumberAndType;
-    private Integer pagesA3;
+    private Integer paperPages;
+    private Integer cardPages;
     private Integer pagesA4;
-    private Integer pagesA3Left;
+    private Integer paperPagesLeft;
+    private Integer cardPagesLeft;
     private Integer pagesA4Left;
 
     public Integer getTotalSubjects() {
@@ -46,12 +48,20 @@ public class ClientPrintStatisticsTotalDto {
         this.paperNumberAndType = paperNumberAndType;
     }
 
-    public Integer getPagesA3() {
-        return pagesA3;
+    public Integer getPaperPages() {
+        return paperPages;
     }
 
-    public void setPagesA3(Integer pagesA3) {
-        this.pagesA3 = pagesA3;
+    public void setPaperPages(Integer paperPages) {
+        this.paperPages = paperPages;
+    }
+
+    public Integer getCardPages() {
+        return cardPages;
+    }
+
+    public void setCardPages(Integer cardPages) {
+        this.cardPages = cardPages;
     }
 
     public Integer getPagesA4() {
@@ -62,12 +72,20 @@ public class ClientPrintStatisticsTotalDto {
         this.pagesA4 = pagesA4;
     }
 
-    public Integer getPagesA3Left() {
-        return pagesA3Left;
+    public Integer getPaperPagesLeft() {
+        return paperPagesLeft;
+    }
+
+    public void setPaperPagesLeft(Integer paperPagesLeft) {
+        this.paperPagesLeft = paperPagesLeft;
+    }
+
+    public Integer getCardPagesLeft() {
+        return cardPagesLeft;
     }
 
-    public void setPagesA3Left(Integer pagesA3Left) {
-        this.pagesA3Left = pagesA3Left;
+    public void setCardPagesLeft(Integer cardPagesLeft) {
+        this.cardPagesLeft = cardPagesLeft;
     }
 
     public Integer getPagesA4Left() {

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

@@ -31,7 +31,8 @@ public class ClientPrintTaskDto {
     @ExcelProperty(name = "单科次A3（页）", width = 30, index = 9)
     private String singlePagesA3;
     private String singlePagesA4;
-    private Integer pagesA3;
+    private Integer paperPages;
+    private Integer cardPages;
     private Integer pagesA4;
     @ExcelProperty(name = "科次", width = 30, index = 10)
     private Integer totalSubjects;
@@ -190,12 +191,20 @@ public class ClientPrintTaskDto {
         this.singlePagesA4 = singlePagesA4;
     }
 
-    public Integer getPagesA3() {
-        return pagesA3;
+    public Integer getPaperPages() {
+        return paperPages;
     }
 
-    public void setPagesA3(Integer pagesA3) {
-        this.pagesA3 = pagesA3;
+    public void setPaperPages(Integer paperPages) {
+        this.paperPages = paperPages;
+    }
+
+    public Integer getCardPages() {
+        return cardPages;
+    }
+
+    public void setCardPages(Integer cardPages) {
+        this.cardPages = cardPages;
     }
 
     public Integer getPagesA4() {

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

@@ -7,11 +7,14 @@ public class ClientPrintTaskTotalDto {
 
     private Integer totalSubjects;
     private Integer packageCount;
-    private Integer pagesA3;
+    private Integer paperPages;
+    private Integer cardPages;
     private Integer pagesA4;
-    private Integer pagesA3Left;
+    private Integer paperPagesLeft;
+    private Integer cardPagesLeft;
     private Integer pagesA4Left;
-    private Integer hostPagesA3;
+    private Integer hostPaperPages;
+    private Integer hostCardPages;
     private Integer hostPagesA4;
 
     public Integer getTotalSubjects() {
@@ -30,12 +33,20 @@ public class ClientPrintTaskTotalDto {
         this.packageCount = packageCount;
     }
 
-    public Integer getPagesA3() {
-        return pagesA3;
+    public Integer getPaperPages() {
+        return paperPages;
     }
 
-    public void setPagesA3(Integer pagesA3) {
-        this.pagesA3 = pagesA3;
+    public void setPaperPages(Integer paperPages) {
+        this.paperPages = paperPages;
+    }
+
+    public Integer getCardPages() {
+        return cardPages;
+    }
+
+    public void setCardPages(Integer cardPages) {
+        this.cardPages = cardPages;
     }
 
     public Integer getPagesA4() {
@@ -46,12 +57,20 @@ public class ClientPrintTaskTotalDto {
         this.pagesA4 = pagesA4;
     }
 
-    public Integer getPagesA3Left() {
-        return pagesA3Left;
+    public Integer getPaperPagesLeft() {
+        return paperPagesLeft;
+    }
+
+    public void setPaperPagesLeft(Integer paperPagesLeft) {
+        this.paperPagesLeft = paperPagesLeft;
     }
 
-    public void setPagesA3Left(Integer pagesA3Left) {
-        this.pagesA3Left = pagesA3Left;
+    public Integer getCardPagesLeft() {
+        return cardPagesLeft;
+    }
+
+    public void setCardPagesLeft(Integer cardPagesLeft) {
+        this.cardPagesLeft = cardPagesLeft;
     }
 
     public Integer getPagesA4Left() {
@@ -62,12 +81,20 @@ public class ClientPrintTaskTotalDto {
         this.pagesA4Left = pagesA4Left;
     }
 
-    public Integer getHostPagesA3() {
-        return hostPagesA3;
+    public Integer getHostPaperPages() {
+        return hostPaperPages;
+    }
+
+    public void setHostPaperPages(Integer hostPaperPages) {
+        this.hostPaperPages = hostPaperPages;
+    }
+
+    public Integer getHostCardPages() {
+        return hostCardPages;
     }
 
-    public void setHostPagesA3(Integer hostPagesA3) {
-        this.hostPagesA3 = hostPagesA3;
+    public void setHostCardPages(Integer hostCardPages) {
+        this.hostCardPages = hostCardPages;
     }
 
     public Integer getHostPagesA4() {

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

@@ -19,7 +19,8 @@ public class PrintTaskDto {
     private String examPlace;
     private String examRoom;
     private String singlePagesA3;
-    private Integer pagesA3;
+    private Integer paperPages;
+    private Integer cardPages;
     private Integer pagesA4;
     private Integer totalSubjects;
     private String status;
@@ -133,12 +134,20 @@ public class PrintTaskDto {
         this.singlePagesA3 = singlePagesA3;
     }
 
-    public Integer getPagesA3() {
-        return pagesA3;
+    public Integer getPaperPages() {
+        return paperPages;
     }
 
-    public void setPagesA3(Integer pagesA3) {
-        this.pagesA3 = pagesA3;
+    public void setPaperPages(Integer paperPages) {
+        this.paperPages = paperPages;
+    }
+
+    public Integer getCardPages() {
+        return cardPages;
+    }
+
+    public void setCardPages(Integer cardPages) {
+        this.cardPages = cardPages;
     }
 
     public Integer getPagesA4() {

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

@@ -8,9 +8,11 @@ public class PrintTaskTotalDto {
     private Integer totalSubjects;
     private Integer packageCount;
     private Integer paperCount;
-    private Integer pagesA3;
+    private Integer paperPages;
+    private Integer cardPages;
     private Integer pagesA4;
-    private Integer pagesA3Left;
+    private Integer paperPagesLeft;
+    private Integer cardPagesLeft;
     private Integer pagesA4Left;
 
     public Integer getTotalSubjects() {
@@ -37,12 +39,20 @@ public class PrintTaskTotalDto {
         this.paperCount = paperCount;
     }
 
-    public Integer getPagesA3() {
-        return pagesA3;
+    public Integer getPaperPages() {
+        return paperPages;
     }
 
-    public void setPagesA3(Integer pagesA3) {
-        this.pagesA3 = pagesA3;
+    public void setPaperPages(Integer paperPages) {
+        this.paperPages = paperPages;
+    }
+
+    public Integer getCardPages() {
+        return cardPages;
+    }
+
+    public void setCardPages(Integer cardPages) {
+        this.cardPages = cardPages;
     }
 
     public Integer getPagesA4() {
@@ -53,12 +63,20 @@ public class PrintTaskTotalDto {
         this.pagesA4 = pagesA4;
     }
 
-    public Integer getPagesA3Left() {
-        return pagesA3Left;
+    public Integer getPaperPagesLeft() {
+        return paperPagesLeft;
+    }
+
+    public void setPaperPagesLeft(Integer paperPagesLeft) {
+        this.paperPagesLeft = paperPagesLeft;
+    }
+
+    public Integer getCardPagesLeft() {
+        return cardPagesLeft;
     }
 
-    public void setPagesA3Left(Integer pagesA3Left) {
-        this.pagesA3Left = pagesA3Left;
+    public void setCardPagesLeft(Integer cardPagesLeft) {
+        this.cardPagesLeft = cardPagesLeft;
     }
 
     public Integer getPagesA4Left() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ClientPrintData.java

@@ -54,8 +54,14 @@ public class ClientPrintData extends BaseEntity implements Serializable {
     /**
      * A3页数
      */
-    @TableField("pages_a3")
-    private Integer pagesA3;
+    @TableField("paper_pages")
+    private Integer paperPages;
+
+    /**
+     * A3页数
+     */
+    @TableField("card_pages")
+    private Integer cardPages;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -101,11 +107,19 @@ public class ClientPrintData extends BaseEntity implements Serializable {
         this.pagesA4 = pagesA4;
     }
 
-    public Integer getPagesA3() {
-        return pagesA3;
+    public Integer getPaperPages() {
+        return paperPages;
+    }
+
+    public void setPaperPages(Integer paperPages) {
+        this.paperPages = paperPages;
+    }
+
+    public Integer getCardPages() {
+        return cardPages;
     }
 
-    public void setPagesA3(Integer pagesA3) {
-        this.pagesA3 = pagesA3;
+    public void setCardPages(Integer cardPages) {
+        this.cardPages = cardPages;
     }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamDetail.java

@@ -77,8 +77,11 @@ public class ExamDetail extends BaseEntity implements Serializable {
     @TableField("package_code")
     private String packageCode;
 
-    @TableField("pages_a3")
-    private Integer pagesA3;
+    @TableField("paper_pages")
+    private Integer paperPages;
+
+    @TableField("card_pages")
+    private Integer cardPages;
 
     @TableField("pages_a4")
     private Integer pagesA4;
@@ -240,12 +243,20 @@ public class ExamDetail extends BaseEntity implements Serializable {
         this.packageCode = packageCode;
     }
 
-    public Integer getPagesA3() {
-        return pagesA3;
+    public Integer getPaperPages() {
+        return paperPages;
+    }
+
+    public void setPaperPages(Integer paperPages) {
+        this.paperPages = paperPages;
+    }
+
+    public Integer getCardPages() {
+        return cardPages;
     }
 
-    public void setPagesA3(Integer pagesA3) {
-        this.pagesA3 = pagesA3;
+    public void setCardPages(Integer cardPages) {
+        this.cardPages = cardPages;
     }
 
     public Integer getPagesA4() {

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

@@ -800,7 +800,8 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             clientPrintData.setSchoolId(schoolId);
             clientPrintData.setExamDetailId(examDetailId);
             clientPrintData.setMachineCode(machineCode);
-            clientPrintData.setPagesA3(examDetail.getPagesA3());
+            clientPrintData.setPaperPages(examDetail.getPaperPages());
+            clientPrintData.setCardPages(examDetail.getCardPages());
             clientPrintData.setPagesA4(examDetail.getPagesA4());
             clientPrintData.setCreateId(sysUser.getId());
             clientPrintData.setCreateTime(System.currentTimeMillis());

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

@@ -420,9 +420,11 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
             // 累计a3,a4
             List<ClientPrintData> list = clientPrintDataService.listBySchoolIdAndMachineCode(schoolId, machineCode);
             if (!list.isEmpty()) {
-                int pagesA3 = list.stream().mapToInt(m -> m.getPagesA3()).sum();
-                clientPrintTaskTotalDto.setHostPagesA3(pagesA3 / 2);
-                int pagesA4 = list.stream().mapToInt(m -> m.getPagesA4()).sum();
+                int paperPages = list.stream().mapToInt(ClientPrintData::getPaperPages).sum();
+                clientPrintTaskTotalDto.setHostPaperPages(paperPages / 2);
+                int cardPages = list.stream().mapToInt(ClientPrintData::getCardPages).sum();
+                clientPrintTaskTotalDto.setHostCardPages(cardPages / 2);
+                int pagesA4 = list.stream().mapToInt(ClientPrintData::getPagesA4).sum();
                 clientPrintTaskTotalDto.setHostPagesA4(pagesA4 / 2);
             }
         }

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

@@ -134,7 +134,8 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
                             .set(ExamDetail::getStatus, ExamDetailStatusEnum.NEW)
                             .set(ExamDetail::getAttachmentId, null)
                             .set(ExamDetail::getAttachmentPath, null)
-                            .set(ExamDetail::getPagesA3, null)
+                            .set(ExamDetail::getPaperPages, null)
+                            .set(ExamDetail::getCardPages, null)
                             .set(ExamDetail::getPagesA4, null)
                             .in(ExamDetail::getId, examDetailIds);
                     examDetailService.update(examDetailUpdateWrapper);

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

@@ -1591,8 +1591,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                         examDetail.setOrgId(sysUser.getOrgId());
                         examDetail.setPrintPlanId(examPrintPlan.getId());
                         examDetail.setPrintPlanName(examPrintPlan.getName());
-                        examDetail.setExamPlace(StringUtils.isBlank(examDetailList.getExamPlace()) ? "考点" + i : examDetailList.getExamPlace()); // 默认填充班级所在校区
-                        examDetail.setExamRoom(StringUtils.isBlank(examDetailList.getExamRoom()) ? clazzName : examDetailList.getExamRoom()); // 默认填充班级
+                        examDetail.setExamPlace(examDetailList.getExamPlace()); // 无默认值
+                        examDetail.setExamRoom(examDetailList.getExamRoom()); // 无默认值
                         examDetail.setStatus(ExamDetailStatusEnum.NEW);
                         examDetail.setExamStartTime(examDetailParams.getExamStartTime());
                         examDetail.setExamEndTime(examDetailParams.getExamEndTime());

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

@@ -653,9 +653,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 //        UploadFileEnum.FILE/
         LocalDateTime nowTime = LocalDateTime.now();
         StringJoiner stringJoiner = new StringJoiner("");
-        stringJoiner.add(dictionaryConfig.fssLocalFileDomain().getConfig()).add(File.separator);
         stringJoiner.add(UploadFileEnum.FILE.getTitle()).add(File.separator);
-
         stringJoiner.add(String.valueOf(nowTime.getYear())).add(File.separator)
                 .add(String.format("%02d", nowTime.getMonthValue())).add(File.separator)
                 .add(String.format("%02d", nowTime.getDayOfMonth()));
@@ -671,6 +669,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
             jsonObject.put(SystemConstant.PATH, dirName);
         } else {
+            dirName = (dictionaryConfig.fssLocalFileDomain().getConfig() + File.separator + dirName).replaceAll("\\\\", "/");
             fileStoreUtil.copyInputStreamToFile(in, new File(stringJoiner.toString()), DigestUtils.md5Hex(new ByteArrayInputStream(outputStream.toByteArray())), LocalCatalogEnum.LOCAL_FILE);
             jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
             jsonObject.put(SystemConstant.PATH, dirName);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -651,7 +651,14 @@ public class CreatePdfUtil {
                 Map<String, String> basicMap = new HashMap<>();
                 basicMap.put("code", code);
                 basicMap.put("name", name);
-                basicMap.put("value", examDetail.getExamRoom());
+                StringJoiner stringJoiner = new StringJoiner("");
+                if(StringUtils.isNotBlank(examDetail.getExamPlace())){
+                    stringJoiner.add(examDetail.getExamPlace());
+                }
+                if(StringUtils.isNotBlank(examDetail.getExamRoom())){
+                    stringJoiner.add(examDetail.getExamRoom());
+                }
+                basicMap.put("value", stringJoiner.toString());
                 basicPlate.add(basicMap);
             } else if ("examCount".equals(code)) {
                 Map<String, String> basicMap = new HashMap<>();
@@ -1067,7 +1074,8 @@ public class CreatePdfUtil {
             }
             examDetail.setCardAttachmentId(basicAttachment.getId());
         }
-        examDetail.setPagesA3(PdfUtil.getPdfPages(localPaperPdfFile));
+        examDetail.setPaperPages(PdfUtil.getPdfPages(localPaperPdfFile));
+        examDetail.setCardPages(PdfUtil.getPdfPages(localA3PdfCardFile));
         examDetail.setPagesA4(PdfUtil.getPdfPages(localA4PdfFile));
         if (PrintMethodEnum.AUTO == basicExamRule.getPrintMethod()) {
             examDetail.setStatus(ExamDetailStatusEnum.WAITING);

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

@@ -111,7 +111,7 @@
     </select>
     <select id="listGenericCard" resultType="com.qmth.distributed.print.business.entity.ExamCard">
         SELECT
-            distinct a.id, a.title, a.type
+            distinct a.id, a.title, a.type, a.create_method createMethod
         FROM
             exam_card a
         WHERE
@@ -125,7 +125,7 @@
     </select>
     <select id="listCustom" resultType="com.qmth.distributed.print.business.entity.ExamCard">
         SELECT
-            a.id, a.title, a.type, a.create_id createId
+            a.id, a.title, a.type, a.create_id createId, a.create_method createMethod
         FROM
             exam_card a
         WHERE

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

@@ -38,7 +38,8 @@
             b.exam_place examPlace,
             b.exam_room examRoom,
             b.total_subjects totalSubjects,
-            ifnull(b.pages_a3, 0) pagesA3,
+            ifnull(b.paper_pages, 0) paperPages,
+            ifnull(b.card_pages, 0) cardPages,
             ifnull(b.pages_a4, 0) pagesA4,
             c.singlePagesA3,
             b.status,
@@ -349,9 +350,11 @@
         SELECT
             ifnull(count(b.package_code), 0) packageCount,
             ifnull(sum(b.total_subjects), 0) totalSubjects,
-            ifnull(sum(ifnull(b.pages_a3, 0)), 0)/2 pagesA3,
+            ifnull(sum(ifnull(b.paper_pages, 0)), 0)/2 paperPages,
+            ifnull(sum(ifnull(b.card_pages, 0)), 0)/2 cardPages,
             ifnull(sum(ifnull(b.pages_a4, 0)), 0) /2 pagesA4,
-            ifnull(sum(case b.status when 'FINISH' then 0 else ifnull(b.pages_a3, 0) end),0)/2 pagesA3Left,
+            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
         FROM
             exam_print_plan a

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

@@ -211,9 +211,10 @@
             b.exam_place examPlace,
             b.exam_room examRoom,
             b.total_subjects totalSubjects,
-            IFNULL(b.pages_a3, 0) pagesA3,
+            IFNULL(b.paper_pages, 0) paperPages,
+            IFNULL(b.card_pages, 0) cardPages,
             IFNULL(b.pages_a4, 0) pagesA4,
-            case b.status when 'FINISH' then IFNULL(b.pages_a3, 0)+IFNULL(b.pages_a4, 0) else 0 end totalPrint,
+            case b.status when 'FINISH' then IFNULL(b.paper_pages, 0)+IFNULL(b.card_pages, 0)+IFNULL(b.pages_a4, 0) else 0 end totalPrint,
             c.singlePagesA3,
             b.status,
             ifnull(b.validate, false) validate,
@@ -312,9 +313,11 @@
         SELECT
             ifnull(count(b.package_code), 0) packageCount,
             ifnull(sum(b.total_subjects), 0) totalSubjects,
-            ifnull(sum(ifnull(b.pages_a3, 0)), 0)/2 pagesA3,
+            ifnull(sum(ifnull(b.paper_pages, 0)), 0)/2 paperPages,
+            ifnull(sum(ifnull(b.card_pages, 0)), 0)/2 cardPages,
             ifnull(sum(ifnull(b.pages_a4, 0)), 0) /2 pagesA4,
-            ifnull(sum(case b.status when 'FINISH' then 0 else ifnull(b.pages_a3, 0) end),0)/2 pagesA3Left,
+            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
         FROM
             exam_print_plan a
@@ -417,8 +420,12 @@
             END) totalSubjectsLeft,
             SUM(CASE b.status
                 WHEN 'FINISH' THEN 0
-                ELSE b.pages_a3
-            END) pagesA3Left,
+                ELSE b.paper_pages
+            END) paperPagesLeft,
+            SUM(CASE b.status
+                WHEN 'FINISH' THEN 0
+                ELSE b.card_pages
+            END) cardPagesLeft,
             SUM(CASE b.status
                 WHEN 'FINISH' THEN 0
                 ELSE b.pages_a4
@@ -477,12 +484,17 @@
             COUNT(b.package_code) packageCount,
             GROUP_CONCAT(c.paper_type) paperNumberAndType,
             SUM(b.total_subjects) totalSubjects,
-            SUM(ifnull(b.pages_a3,0))/2 pagesA3,
+            SUM(ifnull(b.paper_pages,0))/2 paperPages,
+            SUM(ifnull(b.card_pages,0))/2 cardPages,
             SUM(ifnull(b.pages_a4,0))/2 pagesA4,
             SUM(CASE b.status
                 WHEN 'FINISH' THEN 0
-                ELSE ifnull(b.pages_a3, 0)
-            END)/2 pagesA3Left,
+                ELSE ifnull(b.paper_pages, 0)
+            END)/2 paperPagesLeft,
+            SUM(CASE b.status
+                WHEN 'FINISH' THEN 0
+                ELSE ifnull(b.card_pages, 0)
+            END)/2 cardPagesLeft,
             SUM(CASE b.status
                 WHEN 'FINISH' THEN 0
                 ELSE ifnull(b.pages_a4,0)