dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0407

Browse Source
This commit is contained in:
Lx 2025-04-07 16:41:45 +08:00
parent 97127f6223
commit edf7003f37
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java
View File

@ -339,7 +339,17 @@ public class ProcessServiceImpl extends ServiceImpl<ProcessMapper, Process> impl
.set(process.getExamTime() != null, Process::getExamTime, process.getExamTime()) .set(process.getExamTime() != null, Process::getExamTime, process.getExamTime())
.set(process.getImages() != null, Process::getImages, process.getImages())); .set(process.getImages() != null, Process::getImages, process.getImages()));
if(process.getSubject() == 1){ if (process.getExamStatus() != null && process.getExamStatus().equals("1")) {
update(Wrappers.lambdaUpdate(Process.class)
.eq(Process::getUserId, process.getUserId())
.eq(Process::getSubject, process.getSubject())
.eq(Process::getCourseId, process.getCourseId())
.eq(Process::getTenantId, process.getTenantId())
.eq(Process::getDeleted, SchoolBaseConstants.COMMON_NO)
.set(Process::getStatus, 2));
}
if(process.getSubject() == 1 && process.getExamStatus().equals("1")){
update(Wrappers.lambdaUpdate(Process.class) update(Wrappers.lambdaUpdate(Process.class)
.eq(Process::getUserId, process.getUserId()) .eq(Process::getUserId, process.getUserId())
.eq(Process::getSubject, 2) .eq(Process::getSubject, 2)
@ -347,7 +357,7 @@ public class ProcessServiceImpl extends ServiceImpl<ProcessMapper, Process> impl
.eq(Process::getDeleted, SchoolBaseConstants.COMMON_NO) .eq(Process::getDeleted, SchoolBaseConstants.COMMON_NO)
.set(Process::getStatus, SchoolBaseConstants.PROCESS_STATUS_IN_PROGRESS)); .set(Process::getStatus, SchoolBaseConstants.PROCESS_STATUS_IN_PROGRESS));
} }
if(process.getSubject() == 4){ if(process.getSubject() == 4 && process.getExamStatus().equals("1")){
dlDriveSchoolStudentService.updateStudentPassAndGradTime(process.getExamTime(),process.getUserId(),process.getTenantId()); dlDriveSchoolStudentService.updateStudentPassAndGradTime(process.getExamTime(),process.getUserId(),process.getTenantId());
} }

4
dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/vo/ExamBatchItemNewVO.java
View File

@ -66,4 +66,8 @@ public class ExamBatchItemNewVO extends ExamBatchItem {
* 教练Id * 教练Id
*/ */
private Long coachId; private Long coachId;
private String batchId;
private String batchItemId;
} }

2
dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/vo/ExamVO.java
View File

@ -86,4 +86,6 @@ public class ExamVO extends ExamBatchItemNewVO {
* 课程类型（字典：course_type） * 课程类型（字典：course_type）
*/ */
private String courseType; private String courseType;
} }

4
dl-module-jx/src/main/resources/mapper/exam/ExamBatchItemMapper.xml
View File

@ -82,11 +82,13 @@
dseb.end_time, dseb.end_time,
dseb.addr, dseb.addr,
dseb.trans_way, dseb.trans_way,
dseb.id AS batchId,
dsebi.fraction, dsebi.fraction,
dsebi.if_pass, dsebi.if_pass,
dsebi.if_evaluate, dsebi.if_evaluate,
dsebi.evaluate_id dsebi.evaluate_id,
dsebi.id AS batchItemId
FROM FROM
drive_school_process dsp drive_school_process dsp