diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/ObtainDriveContractController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/ObtainDriveContractController.java index fcc8e41d..d68f0c39 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/ObtainDriveContractController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/ObtainDriveContractController.java @@ -33,7 +33,7 @@ public class ObtainDriveContractController { /** * 新增驾校合同 */ - @PostMapping + @PostMapping("/add") @TenantIgnore public CommonResult add(@RequestBody DriveSchoolContract driveSchoolContract) { diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java index a60a67e0..2c125ca3 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java @@ -449,6 +449,7 @@ public class ProcessServiceImpl extends ServiceImpl impl .orderByDesc(Process::getExamTime) ); List examBatchItemNew = examBatchItemMapper.selectExamByUserIdAndCoachId(userId, null); + List result = new ArrayList<>(); result.addAll(BeanUtil.copyToList(processList, ExamVO.class)); result.addAll(examBatchItemNew); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java index ec4de39d..b37712f5 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java @@ -252,7 +252,7 @@ public class ExamBatchItemServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper() .eq(Process::getCourseId, process.getCourseId()) @@ -272,23 +271,7 @@ public class ExamBatchItemServiceImpl extends ServiceImpl list = processService.list(queryWrapper); - if (list.isEmpty()) { - //插入 - Process nextProcess = new Process(); - nextProcess.setCourseId(process.getCourseId()); - nextProcess.setCourseName(process.getCourseName()); - nextProcess.setUserId(process.getUserId()); - nextProcess.setUserName(process.getUserName()); - nextProcess.setUserMobile(process.getUserMobile()); - nextProcess.setCoachId(process.getCoachId()); - nextProcess.setCoachName(process.getCoachName()); - nextProcess.setSubject(process.getSubject() + 1); - nextProcess.setExamNum(process.getExamNum() + 1); - nextProcess.setStatus("1"); - nextProcess.setTrainTime((double) 0); - processService.save(nextProcess); - } else { - //更新状态为进行中 + if (!list.isEmpty()) { Process nextProcess = list.get(0); if(!"2".equals(nextProcess.getStatus())){ nextProcess.setStatus("1"); diff --git a/dl-module-jx/src/main/resources/mapper/exam/ExamBatchItemMapper.xml b/dl-module-jx/src/main/resources/mapper/exam/ExamBatchItemMapper.xml index ad5c2409..932ad07f 100644 --- a/dl-module-jx/src/main/resources/mapper/exam/ExamBatchItemMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/exam/ExamBatchItemMapper.xml @@ -74,7 +74,36 @@