From edf7003f37f2f015a530f4abfd830e04517d8ab0 Mon Sep 17 00:00:00 2001
From: Lx <935448346@qq.com>
Date: Mon, 7 Apr 2025 16:41:45 +0800
Subject: [PATCH] 0407

---
 .../course/service/impl/ProcessServiceImpl.java    | 14 ++++++++++++--
 .../yudao/module/exam/vo/ExamBatchItemNewVO.java   |  4 ++++
 .../cn/iocoder/yudao/module/exam/vo/ExamVO.java    |  2 ++
 .../resources/mapper/exam/ExamBatchItemMapper.xml  |  4 +++-
 4 files changed, 21 insertions(+), 3 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 e8f4112d..9e4bfc75 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
@@ -339,7 +339,17 @@ public class ProcessServiceImpl extends ServiceImpl<ProcessMapper, Process> impl
                 .set(process.getExamTime() != null, Process::getExamTime, process.getExamTime())
                 .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)
                     .eq(Process::getUserId, process.getUserId())
                     .eq(Process::getSubject, 2)
@@ -347,7 +357,7 @@ public class ProcessServiceImpl extends ServiceImpl<ProcessMapper, Process> impl
                     .eq(Process::getDeleted, SchoolBaseConstants.COMMON_NO)
                     .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());
         }
 
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/vo/ExamBatchItemNewVO.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/vo/ExamBatchItemNewVO.java
index 2effd2ba..8d13a22e 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/vo/ExamBatchItemNewVO.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/vo/ExamBatchItemNewVO.java
@@ -66,4 +66,8 @@ public class ExamBatchItemNewVO extends ExamBatchItem {
      * 教练Id
      */
     private Long coachId;
+
+    private String batchId;
+
+    private String batchItemId;
 }
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 7fd2c939..6f2eda5b 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
@@ -86,4 +86,6 @@ public class ExamVO extends ExamBatchItemNewVO {
      * 课程类型（字典：course_type）
      */
     private String courseType;
+
+
 }
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 46516d66..16c33f17 100644
--- a/dl-module-jx/src/main/resources/mapper/exam/ExamBatchItemMapper.xml
+++ b/dl-module-jx/src/main/resources/mapper/exam/ExamBatchItemMapper.xml
@@ -82,11 +82,13 @@
         dseb.end_time,
         dseb.addr,
         dseb.trans_way,
+        dseb.id AS batchId,
 
         dsebi.fraction,
         dsebi.if_pass,
         dsebi.if_evaluate,
-        dsebi.evaluate_id
+        dsebi.evaluate_id,
+        dsebi.id AS batchItemId
 
         FROM
         drive_school_process dsp