bug修改

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

@@ -668,11 +668,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
         for (Long examTaskId : taskReviewLog.getExamTaskIds()) {
             // 校验状态，可能被撤回
-            ExamTask examTask = this.getById(taskReviewLog.getExamTaskId());
+            ExamTask examTask = this.getById(examTaskId);
             if (!ExamStatusEnum.SUBMIT.equals(examTask.getStatus())) {
                 throw ExceptionResultEnum.ERROR.exception("当前状态不能审核");
             }
-            ExamTaskPaperLog examTaskPaperLog = examTaskPaperLogService.getByExamTaskIdAndReview(taskReviewLog.getExamTaskId(), false);
+            ExamTaskPaperLog examTaskPaperLog = examTaskPaperLogService.getByExamTaskIdAndReview(examTaskId, false);
             if (examTaskPaperLog == null) {
                 // 审核日志
                 taskReviewLog.setOperateId(sysUser.getId());
@@ -683,12 +683,12 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
                 // 更新命题任务状态
                 UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.lambda().set(ExamTask::getStatus, statusEnum).set(ExamTask::getReviewStatus, taskReviewLog.getReviewStatus()).eq(ExamTask::getId, taskReviewLog.getExamTaskId());
+                this.update(updateWrapper);
                 if (taskReviewLog.getReviewStatus().name().equals(ReviewStatusEnum.PASS.name())) {
                     // 校验是否可以提交打印状态
                     commonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), sysUser);
                 }
-                updateWrapper.lambda().set(ExamTask::getStatus, statusEnum).set(ExamTask::getReviewStatus, taskReviewLog.getReviewStatus()).eq(ExamTask::getId, taskReviewLog.getExamTaskId());
-                this.update(updateWrapper);
             } else {
                 // 更新记录表状态
                 examTaskPaperLog.setReview(true);

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

@@ -255,7 +255,7 @@
             sum(b.total_subjects) totalSubjects,
             sum(ifnull(b.pages_a3, 0))/2 pagesA3,
             sum(ifnull(b.pages_a4, 0))/2 pagesA4,
-            sum(case b.status when 'FINISH' then 0 else ifnull(b.pages_a4, 0) end)/2 pagesA3Left,
+            sum(case b.status when 'FINISH' then 0 else ifnull(b.pages_a3, 0) end)/2 pagesA3Left,
             sum(case b.status when 'FINISH' then 0 else ifnull(b.pages_a4, 0) end)/2 pagesA4Left
         FROM
             exam_print_plan a
@@ -350,7 +350,7 @@
     </select>
     <select id="selectPaperCount" resultType="java.lang.Integer">
         SELECT
-            COUNT(distinct c.paper_number, c.paper_type)
+            COUNT(distinct c.paper_number)
         FROM
             exam_print_plan a
             JOIN