解决首页bug
This commit is contained in:
parent
ccc7cffdf1
commit
37da64ff15
@ -102,11 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</select>
|
</select>
|
||||||
<select id="selectTrainCar" resultType="cn.iocoder.yudao.module.jx.domain.DriveSchoolCar">
|
<select id="selectTrainCar" resultType="cn.iocoder.yudao.module.jx.domain.DriveSchoolCar">
|
||||||
SELECT
|
SELECT
|
||||||
dsc.*
|
dscc.*
|
||||||
FROM
|
FROM
|
||||||
drive_school_car dsc
|
drive_school_train dst
|
||||||
LEFT JOIN drive_school_train dst ON dsc.user_id = dst.coach_id
|
LEFT JOIN drive_school_coach dsc ON dst.coach_id = dsc.user_id AND dst.deleted = 0
|
||||||
AND dst.deleted = 0
|
LEFT JOIN drive_school_car dscc ON dsc.car_id = dscc.car_no
|
||||||
WHERE
|
WHERE
|
||||||
dst.id IS NOT NULL
|
dst.id IS NOT NULL
|
||||||
AND dsc.deleted = 0
|
AND dsc.deleted = 0
|
||||||
@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
AND dsc.car_no LIKE CONCAT('%',#{searchValue},'%')
|
AND dsc.car_no LIKE CONCAT('%',#{searchValue},'%')
|
||||||
</if>
|
</if>
|
||||||
<if test="courseType != null and courseType != ''">
|
<if test="courseType != null and courseType != ''">
|
||||||
AND dsc.course_type =#{courseType}
|
AND dscc.course_type =#{courseType}
|
||||||
</if>
|
</if>
|
||||||
<if test="startTime!=null and startTime!=''">
|
<if test="startTime!=null and startTime!=''">
|
||||||
AND dst.create_time >= #{startTime}
|
AND dst.create_time >= #{startTime}
|
||||||
@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
AND dst.create_time <= #{endTime}
|
AND dst.create_time <= #{endTime}
|
||||||
</if>
|
</if>
|
||||||
GROUP BY
|
GROUP BY
|
||||||
dsc.id
|
dscc.id
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -34,7 +34,7 @@
|
|||||||
<select id="selectTrainByCondition" resultType="cn.iocoder.yudao.module.train.vo.TrainVO">
|
<select id="selectTrainByCondition" resultType="cn.iocoder.yudao.module.train.vo.TrainVO">
|
||||||
SELECT
|
SELECT
|
||||||
dst.*,
|
dst.*,
|
||||||
dsc.car_id
|
dsc.car_id AS carNo
|
||||||
FROM
|
FROM
|
||||||
drive_school_train dst
|
drive_school_train dst
|
||||||
LEFT JOIN drive_school_coach dsc ON dst.coach_id = dsc.user_id
|
LEFT JOIN drive_school_coach dsc ON dst.coach_id = dsc.user_id
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user