3.2.5 bug修改

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

@@ -69,7 +69,7 @@ public class ExamPackageDetail {
     private BackupMethodEnum backupMethod;
 
     @ApiModelProperty(value = "备份数量")
-    private Integer backupCount;
+    private Double backupCount;
 
     @ApiModelProperty(value = "印刷计划状态")
     private PrintPlanStatusEnum examPrintPlanStatus;
@@ -221,11 +221,11 @@ public class ExamPackageDetail {
         this.backupMethod = backupMethod;
     }
 
-    public Integer getBackupCount() {
+    public Double getBackupCount() {
         return backupCount;
     }
 
-    public void setBackupCount(Integer backupCount) {
+    public void setBackupCount(Double backupCount) {
         this.backupCount = backupCount;
     }
 

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

@@ -2445,12 +2445,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 if (backupMethodEnums.size() != 1 && backupMethodEnums.get(0) != BackupMethodEnum.ROOM) {
                     throw ExceptionResultEnum.ERROR.exception("印刷计划试卷备份方式必须按考场");
                 }
-                List<Integer> backupCountList = examPackageDetailCell.stream().map(ExamPackageDetail::getBackupCount).distinct().collect(Collectors.toList());
+                List<Double> backupCountList = examPackageDetailCell.stream().map(ExamPackageDetail::getBackupCount).distinct().collect(Collectors.toList());
                 if (backupCountList.size() != 1) {
                     throw ExceptionResultEnum.ERROR.exception("印刷计划试卷备份数量异常");
                 }
-                // 试卷该考场备份数量
-                Integer backupCount = backupCountList.get(0);
+
                 // 班级主键','隔开
                 List<Long> clazzIds = new ArrayList<>();
                 String separator = ",";
@@ -2474,6 +2473,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                         }
                     }
                 }
+                // 试卷该考场备份数量
+                Integer backupCount = SystemConstant.calcBackupCount(backupCountList.get(0), studentCount, 1);
                 printCount = studentCount + " + " + backupCount;
                 printTotalCount = printTotalCount + studentCount + backupCount;
 

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

@@ -997,7 +997,7 @@
             epp.name AS examPrintPlanName,
             epp.print_content AS printContent,
             epp.backup_method AS backupMethod,
-            epp.backup_count AS backupCount,
+            ed.backup_count AS backupCount,
             epp.status AS examPrintPlanStatus
         FROM
             exam_detail ed

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -902,7 +902,7 @@ public class ExamTaskController {
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result findExamObject(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                  @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) {
-        return ResultUtil.ok((Object) examTaskService.findExamObjectDtoByPaperNumber(examId, paperNumber));
+        return ResultUtil.ok(examTaskService.findExamObjectDtoByPaperNumber(examId, paperNumber));
     }
 
     @ApiOperation(value = "入库申请-考生对象查询")

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/ExceptionResultEnum.java

@@ -79,7 +79,7 @@ public enum ExceptionResultEnum {
 
     EXAM_CARD_IS_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 50000028, "题卡为空"),
 
-    EXAM_TASK_IS_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 50000029, "命题任务为空"),
+    EXAM_TASK_IS_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 50000029, "命题任务为空或未找到审核通过记录"),
 
     NO_DATA(HttpStatus.INTERNAL_SERVER_ERROR, 5000030, "没有数据"),