Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-27 aa925d851857f50eff0556411366690d9a78a0e5

 cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml

@@ -14,12 +14,12 @@
        signInOrNot,
        reservationStatus
        from t_course_package_student where 1=1
                                            <if test="ids != null and ids.size() > 0">
                                                and  coursePackageSchedulingId in
        <foreach collection="ids" close=")" item="id" open="(" separator=",">
            #{id}
        </foreach>
                                            </if>
        <if test="ids != null and ids.size() > 0">
            and coursePackageSchedulingId in
            <foreach collection="ids" close=")" item="id" open="(" separator=",">
                #{id}
            </foreach>
        </if>

        and reservationStatus != 3
        <if test="null != userId">
@@ -52,14 +52,15 @@
    <select id="getClassList" resultType="com.dsh.course.entity.dto.ClassListDto">

        SELECT
            *,
            pg.NAME AS className,
            pg.`type` AS classType
        *,
        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
        t_course_package_order_student py
        LEFT JOIN t_course_package pg ON py.coursePackageId = pg.id

        <where>
              py.status = 1
            <if test="null != tStudentId">
                and py.studentId = #{tStudentId}
            </if>