From aaa55aa7b0be807ddd6814b13307f9cb2cd9c67a Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期六, 12 十月 2024 11:06:14 +0800
Subject: [PATCH] 新增课程审核 ，短信提醒

---
 exam-system/src/main/resources/mapper/institutionaccess/ThBatchMapper.xml |   42 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/exam-system/src/main/resources/mapper/institutionaccess/ThBatchMapper.xml b/exam-system/src/main/resources/mapper/institutionaccess/ThBatchMapper.xml
index ea40be5..a3ddd68 100644
--- a/exam-system/src/main/resources/mapper/institutionaccess/ThBatchMapper.xml
+++ b/exam-system/src/main/resources/mapper/institutionaccess/ThBatchMapper.xml
@@ -8,11 +8,17 @@
             batch_name,
             institution_id,
             institution_name,
+            train_org_name,
             have_exam,
             status,
             del_flag,
             create_time,
-            update_time
+            update_time,
+            actual_start_time,
+            actual_end_time,
+            expect_start_time,
+            expect_end_time,
+            subject_code
         from th_batch where del_flag = 0
         <if test="query.institutionId != null">
             and institution_id = #{query.institutionId}
@@ -20,11 +26,17 @@
         <if test="query.batchName != null and query.batchName != ''">
             and batch_name like concat('%', #{query.batchaName}, '%')
         </if>
+        <if test="query.subjectCode != null and query.subjectCode != ''">
+            and subject_code like concat(#{query.subjectCode}, '%')
+        </if>
+        <if test="query.trainOrgName != null and query.trainOrgName != ''">
+            and train_org_name = #{query.trainOrgName}, '%')
+        </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(actual_start_time,'%y-%m-%d') &gt;= date_format(#{query.startTime},'%y-%m-%d')
         </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(actual_start_time,'%y-%m-%d') &lt;= date_format(#{query.endTime},'%y-%m-%d')
         </if>
         order by id desc
 
@@ -32,11 +44,12 @@
     <!--批量插入-->
     <insert id="insertBatch">
         INSERT INTO th_batch (id, uuid, institution_id, institution_name,batch_name,have_exam,status,
-        batch_lesson_num,train_org_name, del_flag,create_time,update_time,create_by,update_by) VALUES
+        batch_lesson_num,train_org_name, del_flag,create_time,update_time,create_by,update_by,
+            actual_start_time,actual_end_time,expect_start_time,expect_end_time,subject_code) VALUES
         <foreach collection="batchList" separator="," item="item">
             (#{item.id},#{item.uuid},#{item.institutionId},#{item.institutionName},#{item.batchName},#{item.haveExam},#{item.status},
             #{item.batchLessonNum},#{item.trainOrgName},#{item.delFlag},#{item.createTime},
-            #{item.updateTime},#{item.createBy},#{item.updateBy})
+            #{item.updateTime},#{item.createBy},#{item.updateBy},#{item.actualStartTime},#{item.actualEndTime},#{item.expectStartTime},#{item.expectEndTime},#{item.subjectCode})
         </foreach>
     </insert>
 
@@ -76,7 +89,22 @@
                     update_by = #{item.updateBy},
                 </if>
                 <if test="item.updateTime != null" >
-                    update_time = #{item.updateTime}
+                    update_time = #{item.updateTime},
+                </if>
+                <if test="item.actualStartTime != null" >
+                    actual_start_time = #{item.actualStartTime},
+                </if>
+                <if test="item.actualEndTime != null" >
+                    actual_end_time = #{item.actualEndTime},
+                </if>
+                <if test="item.expectStartTime != null" >
+                    expect_start_time = #{item.expectStartTime},
+                </if>
+                <if test="item.expectEndTime != null" >
+                    expect_end_time = #{item.expectEndTime},
+                </if>
+                <if test="item.subjectCode != null and item.subjectCode != ''" >
+                    subject_code = #{item.subjectCode}
                 </if>
             </set>
             where id = #{item.id}
@@ -122,7 +150,7 @@
 
     <select id="getByUuids" resultType="com.gkhy.exam.institutionalaccess.entity.ThBatch">
         select id, uuid, institution_id, institution_name,batch_name,have_exam,status,
-        batch_lesson_num,train_org_name
+        batch_lesson_num,train_org_name,actual_start_time,actual_end_time,expect_start_time,expect_end_time,subject_code
         from th_batch
         where del_flag = 0 and uuid in
         <foreach collection="batchUuids" item="uuid" index ="index" open="(" close=")" separator=",">

--
Gitblit v1.9.2