Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

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

@@ -17,14 +17,16 @@


    <select id="queryCoursePackageSchedulingList" resultType="map">
        select
        CAST(id AS CHAR(20)) as id,
        DATE_FORMAT(classDate, '%Y-%m-%d') as classDate,
        courseId,
        `status`,
        cancelClasses,
        deductClassHour,
        integral
        from t_course_package_scheduling where coursePackageId = #{item.coursePackageId} order by classDate desc
        SELECT
            CAST(id AS CHAR(20)) AS id,
            CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'), '-20:00') AS classDate,
            courseId,
            `status`,
            cancelClasses,
            deductClassHour,
            integral
        FROM t_course_package_scheduling where coursePackageId = #{item.coursePackageId} GROUP BY classDate
        order by classDate desc

    </select>
</mapper>