3.4.0 update

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

@@ -11,11 +11,11 @@ import java.util.Map;
 
 public interface ExamTaskWholeService extends IService<ExamTaskWhole> {
 
-   void checkAndCreateTask(Long examId, Long courseId, String paperNumber);
+    void checkAndCreateTask(Long examId, Long courseId, String paperNumber);
 
-   ExamTaskWhole getByExamIdAndCourseIdAndPaperNumber(Long examId, Long courseId, String paperNumber);
+    ExamTaskWhole getByExamIdAndCourseIdAndPaperNumber(Long examId, String paperNumber);
 
-   Map getWholePdf(Long examId, Long courseId, String paperNumber);
+    Map getWholePdf(Long examId, String paperNumber);
 
-   void mergeWholePdf(ExamTaskWhole examTaskWhole);
+    void mergeWholePdf(ExamTaskWhole examTaskWhole);
 }

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

@@ -777,6 +777,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
                         markUserGroupService.deleteByExamIdAndPaperNumberAndGroupNumber(examDetail.getExamId(), examDetailCourse.getPaperNumber(), null);
                         markUserClassService.deleteByExamIdAndPaperNumber(examDetail.getExamId(), examDetailCourse.getPaperNumber());
                     } else {
+                        markPaperPackageService.deleteByExamIdAndPaperNumberAndPackageCode(examDetail.getExamId(), examDetailCourse.getPaperNumber(), examDetail.getPackageCode());
                         for (String paperType : examDetailCourse.getPaperType().split(",")) {
                             markPaperService.updateStudentCountByExamIdAndPaperNumberAndPaperType(examDetail.getExamId(), examDetailCourse.getPaperNumber(), paperType);
                         }

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

@@ -60,7 +60,7 @@ public class ExamTaskWholeServiceImpl extends ServiceImpl<ExamTaskWholeMapper, E
             }
             examTaskWholeList.add(key);
             boolean isAllPrintFinish = examDetailService.allExamDetailIsExist(examId, courseId, paperNumber);
-            ExamTaskWhole examTaskWhole = this.getByExamIdAndCourseIdAndPaperNumber(examId, courseId, paperNumber);
+            ExamTaskWhole examTaskWhole = this.getByExamIdAndCourseIdAndPaperNumber(examId, paperNumber);
             if (isAllPrintFinish) {
                 if (examTaskWhole != null) {
                     if (ExamTaskWholeStatusEnum.RUNNING.equals(examTaskWhole.getStatus())) {
@@ -94,17 +94,16 @@ public class ExamTaskWholeServiceImpl extends ServiceImpl<ExamTaskWholeMapper, E
     }
 
     @Override
-    public ExamTaskWhole getByExamIdAndCourseIdAndPaperNumber(Long examId, Long courseId, String paperNumber) {
+    public ExamTaskWhole getByExamIdAndCourseIdAndPaperNumber(Long examId, String paperNumber) {
         QueryWrapper<ExamTaskWhole> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(ExamTaskWhole::getExamId, examId)
-                .eq(ExamTaskWhole::getCourseId, courseId)
                 .eq(ExamTaskWhole::getPaperNumber, paperNumber);
         return this.getOne(queryWrapper);
     }
 
     @Override
-    public Map getWholePdf(Long examId, Long courseId, String paperNumber) {
-        ExamTaskWhole examTaskWhole = getByExamIdAndCourseIdAndPaperNumber(examId, courseId, paperNumber);
+    public Map getWholePdf(Long examId, String paperNumber) {
+        ExamTaskWhole examTaskWhole = getByExamIdAndCourseIdAndPaperNumber(examId, paperNumber);
         Map map = new HashMap();
         map.put("status", examTaskWhole != null ? examTaskWhole.getStatus() : ExamTaskWholeStatusEnum.INIT);
         map.put("url", examTaskWhole != null && StringUtils.isNotBlank(examTaskWhole.getAttachmentPath()) ? fileUploadService.filePreview(examTaskWhole.getAttachmentPath()) : null);

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

@@ -178,6 +178,7 @@ public class ExamPrintPlanController {
         List<ExamTaskDetailDto> examTasks = examTaskDetailService.list(semesterId, examId, relateType, idList, courseId, paperNumber, userName);
         for (ExamTaskDetailDto examTask : examTasks) {
             RelatePaperParam relatePaperParam = new RelatePaperParam();
+            relatePaperParam.setExamId(examId);
             relatePaperParam.setExamDetailCourseIds(examTask.getExamDetailCourseIds());
             relatePaperParam.setExamTaskId(Long.valueOf(examTask.getId()));
             relatePaperParam.setPaperNumber(examTask.getPaperNumber());

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

@@ -206,9 +206,8 @@ public class ExamPrintTaskController {
     @ApiOperation(value = "印刷任务管理-完整pdf查询")
     @RequestMapping(value = "/get_whole_pdf", method = RequestMethod.POST)
     public Result getWholePdf(@ApiParam(value = "考试ID") @RequestParam Long examId,
-                              @ApiParam(value = "课程ID") @RequestParam(required = false) Long courseId,
                               @ApiParam(value = "试卷编号") @RequestParam String paperNumber) {
-        return ResultUtil.success(examTaskWholeService.getWholePdf(examId, courseId, paperNumber));
+        return ResultUtil.success(examTaskWholeService.getWholePdf(examId, paperNumber));
     }
 
     @ApiOperation(value = "印刷任务管理-生成pdf查询")

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkPaperPackageService.java

@@ -22,4 +22,6 @@ public interface MarkPaperPackageService extends IMppService<MarkPaperPackage> {
     int getPackageCountByExamId(Long examId, Long courseId, String coursePaperId, MarkPaperStatus status, DataPermissionRule dpr);
 
     void deleteByExamIdAndPaperNumber(Long examId, String paperNumber);
+
+    void deleteByExamIdAndPaperNumberAndPackageCode(Long examId, String paperNumber, String packageCode);
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkPaperPackageServiceImpl.java

@@ -32,6 +32,15 @@ public class MarkPaperPackageServiceImpl extends MppServiceImpl<MarkPaperPackage
         UpdateWrapper<MarkPaperPackage> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().eq(MarkPaperPackage::getExamId, examId)
                 .eq(MarkPaperPackage::getPaperNumber, paperNumber);
-        this.list(updateWrapper);
+        this.remove(updateWrapper);
+    }
+
+    @Override
+    public void deleteByExamIdAndPaperNumberAndPackageCode(Long examId, String paperNumber, String packageCode) {
+        UpdateWrapper<MarkPaperPackage> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().eq(MarkPaperPackage::getExamId, examId)
+                .eq(MarkPaperPackage::getPaperNumber, paperNumber)
+                .eq(MarkPaperPackage::getPackageCode, packageCode);
+        this.remove(updateWrapper);
     }
 }