From 70dcf4e610a0ec5fd6ca2c3daf9edf4957b30529 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Tue, 25 Feb 2025 16:34:46 +0800
Subject: [PATCH] 考试制证修改

---
 exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml b/exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml
index bce3e7d..b583c95 100644
--- a/exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml
+++ b/exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml
@@ -20,7 +20,8 @@
             d.finish_position,
             d.video_url,
             d.lesson_report_url,
-            d.create_time
+            d.create_time,
+            d.complete_status
         FROM
             th_study_detail d
         where d.del_flag = 0
@@ -31,10 +32,20 @@
             and d.course_uuid = #{query.courseUuid}
         </if>
         <if test="query.startTime != null"><!-- 开始时间检索 -->
-            and date_format(d.create_time,'%y-%m-%d') &gt;= date_format(#{query.startTime},'%y-%m-%d')
+            and date_format(d.start_time,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{query.startTime},'%y-%m-%d %H:%i:%s')
         </if>
         <if test="query.endTime != null"><!-- 结束时间检索 -->
-            and date_format(d.create_time,'%y-%m-%d') &lt;= date_format(#{query.endTime},'%y-%m-%d')
+            and date_format(d.start_time,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{query.endTime},'%y-%m-%d %H:%i:%s')
+        </if>
+        <if test="query.status == 0"></if>
+        <if test="query.status == 1">
+            and (d.duration - TIMESTAMPDIFF(SECOND, start_time, finish_time)) &lt;= 30
+        </if>
+        <if test="query.status == 2">
+            and (d.duration-TIMESTAMPDIFF(SECOND, start_time, finish_time)) &gt; 30
+        </if>
+        <if test="query.institutionId !=null">
+            and institution_id = #{query.institutionId}
         </if>
         ORDER BY
         d.id DESC
@@ -70,12 +81,13 @@
 
     <insert id="insertBatch">
         INSERT INTO th_study_detail (id,uuid,serial_num, idcard,institution_id, institution_name,course_uuid, train_org_name,batch_uuid,chapter_uuid,
-        finish_status,duration,start_time,finish_time,start_position,finish_position,video_url,lesson_report_url,del_flag,create_time,update_time,create_by,update_by) VALUES
+        finish_status,duration,start_time,finish_time,start_position,finish_position,video_url,lesson_report_url,del_flag,create_time,update_time,create_by,update_by,
+        complete_status) VALUES
         <foreach collection="list" separator="," item="item">
             (#{item.id},#{item.uuid},#{item.serialNum},#{item.idcard},#{item.institutionId},#{item.institutionName},#{item.courseUuid},#{item.trainOrgName},#{item.batchUuid},#{item.chapterUuid},
              #{item.finishStatus},#{item.duration},#{item.startTime},
             #{item.finishTime},#{item.startPosition},#{item.finishPosition},#{item.videoUrl},#{item.lessonReportUrl},#{item.delFlag},#{item.createTime},
-            #{item.updateTime},#{item.createBy},#{item.updateBy})
+            #{item.updateTime},#{item.createBy},#{item.updateBy},#{item.completeStatus})
         </foreach>
     </insert>
     <update id="updateBatch" parameterType="java.util.List" >
@@ -140,7 +152,10 @@
                     update_by = #{item.updateBy},
                 </if>
                 <if test="item.updateTime != null" >
-                    update_time = #{item.updateTime}
+                    update_time = #{item.updateTime},
+                </if>
+                <if test="item.completeStatus != null" >
+                    complete_status = #{item.completeStatus}
                 </if>
             </set>
             where id = #{item.id}

--
Gitblit v1.9.2