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 |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
index 3b900eb..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=")">
@@ -26,4 +29,40 @@
         </if>
         order by insertTime desc
     </select>
+
+    <select id="listAll" resultType="com.dsh.course.entity.StudentClassInfo">
+        SELECT
+            SUM( py.totalClassHours ) AS totalHours,
+            SUM( py.laveClassHours ) AS restHours,
+            SUM( py.giftClassHours ) as giftHours
+        FROM
+            t_course_package_payment  py
+
+           where  py.studentId = #{tStudentId}
+
+    </select>
+
+    <select id="getClassList" resultType="com.dsh.course.entity.dto.ClassListDto">
+
+        SELECT
+            *,
+            pg.NAME AS className,
+            pg.`type` AS classType
+        FROM
+            t_course_package_payment py
+                LEFT JOIN t_course_package pg ON py.coursePackageId = pg.id
+
+
+        <where>
+            <if test="null != tStudentId">
+                py.studentId = #{tStudentId}
+            </if>
+        </where>
+    </select>
+    <select id="getMaxDate" resultType="java.util.Date">
+        SELECT
+            MAX(useTime)
+        FROM t_course_package_payment py
+        where py.studentId = #{tStudentId}
+    </select>
 </mapper>

--
Gitblit v1.7.1