|
@@ -65,9 +65,11 @@
|
|
c.type custom_type ,
|
|
c.type custom_type ,
|
|
bs.name service,
|
|
bs.name service,
|
|
w.`status` delay_status,
|
|
w.`status` delay_status,
|
|
- w.warn_time
|
|
|
|
|
|
+ w.warn_time,
|
|
|
|
+ n.title
|
|
FROM
|
|
FROM
|
|
sys_message m
|
|
sys_message m
|
|
|
|
+ LEFT JOIN sys_notice n ON n.id = m.notice_id
|
|
LEFT JOIN sys_user u ON u.id = m.form_user_id
|
|
LEFT JOIN sys_user u ON u.id = m.form_user_id
|
|
LEFT JOIN sys_custom c ON c.manager_id = m.receive_user_id
|
|
LEFT JOIN sys_custom c ON c.manager_id = m.receive_user_id
|
|
LEFT JOIN t_b_service bs ON bs.id = m.service_id
|
|
LEFT JOIN t_b_service bs ON bs.id = m.service_id
|
|
@@ -92,8 +94,11 @@
|
|
<if test="serviceId != null and serviceId != ''">
|
|
<if test="serviceId != null and serviceId != ''">
|
|
and m.service_id = #{serviceId}
|
|
and m.service_id = #{serviceId}
|
|
</if>
|
|
</if>
|
|
|
|
+<!-- <if test="query != null and query != ''">-->
|
|
|
|
+<!-- and m.content like concat('%', #{query} , '%')-->
|
|
|
|
+<!-- </if>-->
|
|
<if test="query != null and query != ''">
|
|
<if test="query != null and query != ''">
|
|
- and m.content like concat('%', #{query} , '%')
|
|
|
|
|
|
+ and n.title like concat('%', #{query} , '%')
|
|
</if>
|
|
</if>
|
|
<if test="startTime != null and startTime != '' ">
|
|
<if test="startTime != null and startTime != '' ">
|
|
<![CDATA[
|
|
<![CDATA[
|