Browse Source

3.2.3 试卷编号在考试下唯一bug修改

xiaofei 2 năm trước cách đây
mục cha
commit
1f5c8097a1

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamPaperStructureService.java

@@ -88,5 +88,5 @@ public interface ExamPaperStructureService extends IService<ExamPaperStructure>
      * @param paperNumber 试卷编号
      * @param transferId  转办对象ID
      */
-    boolean transfer(String courseCode, String paperNumber, Long transferId);
+    boolean transfer(Long examId, String courseCode, String paperNumber, Long transferId);
 }

+ 2 - 3
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamPaperStructureServiceImpl.java

@@ -452,10 +452,9 @@ public class ExamPaperStructureServiceImpl extends ServiceImpl<ExamPaperStructur
     }
 
     @Override
-    public boolean transfer(String courseCode, String paperNumber, Long transferId) {
+    public boolean transfer(Long examId, String courseCode, String paperNumber, Long transferId) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        // todo xf 20230413
-        ExamTask examTask = examTaskService.getByCourseCodeAndPaperNumber(schoolId, null, courseCode, paperNumber);
+        ExamTask examTask = examTaskService.getByCourseCodeAndPaperNumber(schoolId, examId, courseCode, paperNumber);
         // transferId为空时,则为打回给命题老师
         UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().set(ExamTask::getTransferId, transferId)

+ 3 - 2
distributed-print/src/main/java/com/qmth/distributed/print/api/ExamPaperStructureController.java

@@ -204,10 +204,11 @@ public class ExamPaperStructureController {
     @ApiOperation(value = "转办/打回")
     @RequestMapping(value = "/transfer", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
-    public Result transfer(@ApiParam(value = "课程代码", required = true) @RequestParam String courseCode,
+    public Result transfer(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
+                           @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode,
                            @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                            @ApiParam(value = "用户ID", required = false) @RequestParam(required = false) Long transferId) {
-        return ResultUtil.ok(examPaperStructureService.transfer(courseCode, paperNumber, transferId));
+        return ResultUtil.ok(examPaperStructureService.transfer(examId, courseCode, paperNumber, transferId));
     }
 }