From 3bfe5dbfb1b5a72a628a61fc1b5a617f27d86c74 Mon Sep 17 00:00:00 2001
From: Lx <935448346@qq.com>
Date: Thu, 17 Apr 2025 18:30:11 +0800
Subject: [PATCH] 0417-3

---
 .../course/service/impl/ProcessServiceImpl.java   |  1 +
 .../service/impl/ExamBatchItemServiceImpl.java    | 15 +++++++++------
 .../cn/iocoder/yudao/module/exam/vo/ExamVO.java   |  2 ++
 .../resources/mapper/exam/ExamBatchItemMapper.xml | 14 +++++++-------
 4 files changed, 19 insertions(+), 13 deletions(-)

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 2c125ca3..f2147046 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
@@ -373,6 +373,7 @@ public class ProcessServiceImpl extends ServiceImpl<ProcessMapper, Process> impl
         }
         // 如果是科目一且通过考试，修改科目二状态
         if (process.getSubject() == 1 && process.getExamStatus().equals("1")) {
+            
             update(Wrappers.lambdaUpdate(Process.class)
                     .eq(Process::getUserId, process.getUserId())
                     .eq(Process::getSubject, 2)
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 b37712f5..0f366303 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
@@ -18,6 +18,7 @@ import cn.iocoder.yudao.module.exam.vo.ExamBatchVO;
 import cn.iocoder.yudao.module.exam.vo.ExamVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.SneakyThrows;
@@ -227,10 +228,10 @@ public class ExamBatchItemServiceImpl extends ServiceImpl<ExamBatchItemMapper, E
     @Transactional(rollbackFor = Exception.class)
     public void updateObjNew(ExamBatchItemNewVO examBatchVO) {
         String subject = "";
-        if(examBatchVO.getSubject() == 2){
+        if (examBatchVO.getSubject() == 2) {
             subject = "科目二";
-        }else if(examBatchVO.getSubject() == 4){
-            subject = "科目四";
+        } else if (examBatchVO.getSubject() == 3) {
+            subject = "科目三";
         }
         //教练ID
         Long userId = SecurityFrameworkUtils.getLoginUserId();
@@ -252,8 +253,10 @@ public class ExamBatchItemServiceImpl extends ServiceImpl<ExamBatchItemMapper, E
         process.setRemark(examBatchVO.getRemark());
         //已完成
 
-        process.setExamStatus(examBatchVO.getIfPass() ? "1" : "null");
+        process.setExamStatus(examBatchVO.getIfPass() ? "1" : "0");
+
         processService.updateById(process);
+
         //更新考试批次的通过率
         this.updateBatchPassRate(examBatch.getId());
         if (examBatchVO.getIfPass()) {
@@ -269,11 +272,11 @@ public class ExamBatchItemServiceImpl extends ServiceImpl<ExamBatchItemMapper, E
                         .eq(Process::getCourseId, process.getCourseId())
                         .eq(Process::getUserId, process.getUserId())
                         .eq(Process::getSubject, nextSubject)
-                        .eq(Process::getTenantId,process.getTenantId());
+                        .eq(Process::getTenantId, process.getTenantId());
                 List<Process> list = processService.list(queryWrapper);
                 if (!list.isEmpty()) {
                     Process nextProcess = list.get(0);
-                    if(!"2".equals(nextProcess.getStatus())){
+                    if (!"2".equals(nextProcess.getStatus())) {
                         nextProcess.setStatus("1");
                         processService.updateById(nextProcess);
                     }
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/vo/ExamVO.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/vo/ExamVO.java
index 6f2eda5b..85602a1d 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/vo/ExamVO.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/vo/ExamVO.java
@@ -87,5 +87,7 @@ public class ExamVO extends ExamBatchItemNewVO {
      */
     private String courseType;
 
+    private String ifPassStatus;
+
 
 }
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 932ad07f..aa4bda67 100644
--- a/dl-module-jx/src/main/resources/mapper/exam/ExamBatchItemMapper.xml
+++ b/dl-module-jx/src/main/resources/mapper/exam/ExamBatchItemMapper.xml
@@ -77,14 +77,14 @@
 
         SELECT
         dseb.*,
-        /*dseb.batch_name,
-        dseb.start_time,
-        dseb.end_time,
-        dseb.addr,
-        dseb.trans_way,*/
         dseb.start_time AS examStartTime,
 
-        dsc.type AS courseType,
+        dsp.course_type AS courseType,
+        CASE
+        WHEN dsebi.fraction IS NULL AND dsebi.if_pass IS NULL
+        THEN dsp.exam_status
+        ELSE NULL
+        END AS ifPassStatus,
 
         dsebi.batch_id,
         dsebi.user_name,
@@ -97,7 +97,7 @@
         dsebi.id AS batchItemId
         FROM drive_school_exam_batch dseb
         LEFT JOIN drive_school_exam_batch_item dsebi ON dseb.id = dsebi.batch_id
-        LEFT JOIN drive_school_course dsc ON dseb.course_id = dsc.id
+        LEFT JOIN drive_school_process dsp ON dseb.course_id = dsp.course_id AND dseb.subject = dsp.subject AND dsebi.user_id = dsp.user_id
         WHERE
         dsebi.user_id = #{userId}
         AND (dseb.deleted = 0 OR dseb.deleted IS NULL)