From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
index 2c7eee1..e142ec7 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsh.course.mapper.CoursePackageStudentMapper">
-
+    <update id="updateSignInOrNotById">
+        update t_course_package_student set signInOrNot = 2 where id =#{id}
+    </update>
 
 
     <select id="queryCoursePackageStudentList" resultType="map">
@@ -12,6 +14,7 @@
         signInOrNot,
         reservationStatus
         from t_course_package_student where coursePackageSchedulingId = #{coursePackageSchedulingId}
+        and reservationStatus != 3
         <if test="null != userId">
             and appUserId in
             <foreach collection="appUserId" item="item" index="index" separator="," open="(" close=")">
@@ -44,11 +47,11 @@
         SELECT
             *,
             pg.NAME AS className,
-            ty.`name` AS classType
+            pg.`type` AS classType
         FROM
             t_course_package_payment py
                 LEFT JOIN t_course_package pg ON py.coursePackageId = pg.id
-                LEFT JOIN t_course_package_type ty ON pg.type = ty.id
+
 
         <where>
             <if test="null != tStudentId">

--
Gitblit v1.7.1