|
@@ -7,11 +7,11 @@
|
|
SELECT * FROM(
|
|
SELECT * FROM(
|
|
select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
|
|
select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
|
|
,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as webSite,thumb
|
|
,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as webSite,thumb
|
|
- ,null as algorithmTime,c.child_name,s.camera_id
|
|
|
|
|
|
+ ,null as algorithmTime,c.child_name,s.camera_id,s.laser_title
|
|
from t_scene_pro s
|
|
from t_scene_pro s
|
|
<include refid="commonWhere"></include>
|
|
<include refid="commonWhere"></include>
|
|
<if test="param.sceneName != null and param.sceneName!='' ">
|
|
<if test="param.sceneName != null and param.sceneName!='' ">
|
|
- and s.scene_name like concat ('%',#{param.sceneName},'%')
|
|
|
|
|
|
+ and (s.scene_name like concat ('%',#{param.sceneName},'%') or s.laser_title like concat ('%',#{param.sceneName},'%') )
|
|
</if>
|
|
</if>
|
|
and is_upgrade = 0
|
|
and is_upgrade = 0
|
|
UNION
|
|
UNION
|
|
@@ -22,7 +22,7 @@
|
|
left join t_scene_plus_ext e on s.id = e.plus_id
|
|
left join t_scene_plus_ext e on s.id = e.plus_id
|
|
<include refid="commonWhere"></include>
|
|
<include refid="commonWhere"></include>
|
|
<if test="param.sceneName != null and param.sceneName!='' ">
|
|
<if test="param.sceneName != null and param.sceneName!='' ">
|
|
- and s.title like concat ('%',#{param.sceneName},'%')
|
|
|
|
|
|
+ and (s.scene_name like concat ('%',#{param.sceneName},'%') or s.laser_title like concat ('%',#{param.sceneName},'%') )
|
|
</if>
|
|
</if>
|
|
) as tb
|
|
) as tb
|
|
order by create_time desc
|
|
order by create_time desc
|