|
|
@@ -3,7 +3,7 @@
|
|
|
<mapper namespace="com.fdkankan.manage_jp.mapper.ISceneProMapper">
|
|
|
|
|
|
<sql id="folderSelect">
|
|
|
- select f.name as sceneName,null as num ,null as create_time,null as sn_code,null as sceneSize
|
|
|
+ select id, f.name as sceneName,null as num ,null as create_time,null as sn_code,null as sceneSize
|
|
|
,null as user_name,null as view_count,null as status,null as pay_status,null as scene_version,null as webSite,null as thumb
|
|
|
,null as algorithmTime,null as child_name,null as camera_id,null as laser_title,co.company_name,null as location,null as scene_source,null as shoot_count,null as map_show
|
|
|
,1 as sort_order
|
|
|
@@ -31,7 +31,7 @@
|
|
|
<include refid="folderSelect"></include>
|
|
|
UNION
|
|
|
</if>
|
|
|
- select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
|
|
|
+ select id,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
|
|
|
,null as algorithmTime,c.child_name,s.camera_id,s.laser_title,co.company_name,null as location,s.scene_source,s.shoot_count,s.map_show
|
|
|
,2 as sort_order
|
|
|
@@ -45,7 +45,7 @@
|
|
|
</if>
|
|
|
and is_upgrade = 0
|
|
|
UNION
|
|
|
- select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
|
|
|
+ select id, s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
|
|
|
,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site as webSite,thumb
|
|
|
,algorithm_time,c.child_name,s.camera_id,s.laser_title,co.company_name,e.location,s.scene_source,e.shoot_count,s.map_show
|
|
|
,3 as sort_order
|
lyhzzz