|
|
@@ -140,6 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
LEFT JOIN md_workshop ws ON ws.workshop_id = j.workshop_id
|
|
|
LEFT JOIN is_workarea wa ON wa.workarea_id = j.workarea_id
|
|
|
LEFT JOIN is_job_ticket_points p ON p.ticket_id = j.ticket_id
|
|
|
+ LEFT JOIN is_job_ticket_user u ON u.ticket_id = j.ticket_id
|
|
|
<where>
|
|
|
<if test="dto.ticketCode != null and dto.ticketCode.trim != ''">
|
|
|
and j.ticket_code like concat('%',#{dto.ticketCode},'%')
|
|
|
@@ -165,6 +166,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="dto.endTime != null and dto.endTime.trim != ''">
|
|
|
and j.create_time <= #{dto.endTime}
|
|
|
</if>
|
|
|
+ <if test="dto.userId != null and dto.userId.trim != ''">
|
|
|
+ and u.user_id = #{dto.userId}
|
|
|
+ </if>
|
|
|
</where>
|
|
|
GROUP BY j.ticket_id
|
|
|
ORDER BY j.ticket_id DESC
|