deason 6 years ago
parent
commit
07a55d8800

+ 7 - 4
examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/PrintingProjectStatisticServiceImpl.java

@@ -160,7 +160,7 @@ public class PrintingProjectStatisticServiceImpl implements PrintingProjectStati
             //备份-A3数量(每袋冗余数 + 单独备份袋数)
             final int backupA3 = backupMaps.get("backupA3");
 
-            //备份-A4数量(试卷袋数 * 2)
+            //备份-A4数量(∑n (学习中心或考点) * 2)
             final int backupA4 = backupMaps.get("backupA4");
 
             statistic.setTotalStudent(totalStudent);
@@ -224,9 +224,6 @@ public class PrintingProjectStatisticServiceImpl implements PrintingProjectStati
         }
 
         if (backupSetting.getNeedAlonePkg()) {
-            //备份-A4数量:只有单独备份袋设置才计算,默认不用算
-            backupA4 = packageCodes.size() * 2;
-
             //备份A3 = ∑n 学习中心或考点(X考生 * P%备份比例) * 2
             int aloneTotal = 0;
 
@@ -245,6 +242,9 @@ public class PrintingProjectStatisticServiceImpl implements PrintingProjectStati
                     int count = statisticService.countExamTotalStudentByLearnCenter(examId, learnCenterId);
                     aloneTotal += Math.ceil((count * percent) / 100);
                 }
+
+                //备份-A4数量:只有单独备份袋设置才计算,默认不用算
+                backupA4 = learnCenters.size() * 2;
             } else {
                 //计算每个考点的备份数
                 List<String> siteIds = statisticService.findExamSites(examId);
@@ -252,6 +252,9 @@ public class PrintingProjectStatisticServiceImpl implements PrintingProjectStati
                     int count = statisticService.countExamTotalStudentBySite(examId, siteId);
                     aloneTotal += Math.ceil((count * percent) / 100);
                 }
+
+                //备份-A4数量:只有单独备份袋设置才计算,默认不用算
+                backupA4 = siteIds.size() * 2;
             }
 
             backupA3 += (aloneTotal * 2);