|
@@ -57,7 +57,7 @@
|
|
json_address,max_time
|
|
json_address,max_time
|
|
from simulation.scene_accident
|
|
from simulation.scene_accident
|
|
<where>
|
|
<where>
|
|
- is_deleted=0
|
|
|
|
|
|
+ is_deleted = '0'
|
|
<if test="userId != null and userId != ''">
|
|
<if test="userId != null and userId != ''">
|
|
and create_user_id =#{userId}
|
|
and create_user_id =#{userId}
|
|
</if>
|
|
</if>
|
|
@@ -120,7 +120,7 @@
|
|
</foreach>
|
|
</foreach>
|
|
</if>
|
|
</if>
|
|
</where>
|
|
</where>
|
|
- order by modify_time, scene_name desc
|
|
|
|
|
|
+ order by create_time, scene_name desc
|
|
</select>
|
|
</select>
|
|
<select id="querySceneAccidentListByBq" parameterType="api.common.pojo.param.scene.SceneAccidentParam"
|
|
<select id="querySceneAccidentListByBq" parameterType="api.common.pojo.param.scene.SceneAccidentParam"
|
|
resultType="api.common.pojo.po.scene.SceneAccidentPO">
|
|
resultType="api.common.pojo.po.scene.SceneAccidentPO">
|
|
@@ -343,6 +343,7 @@
|
|
jt on qx.scene_name=jt.scene_name and jt.share='2' union select jtNew.* from scene_accident jtNew where
|
|
jt on qx.scene_name=jt.scene_name and jt.share='2' union select jtNew.* from scene_accident jtNew where
|
|
jtNew.share='1' and is_deleted='0') cc
|
|
jtNew.share='1' and is_deleted='0') cc
|
|
<where>
|
|
<where>
|
|
|
|
+ is_deleted = '0'
|
|
<if test="sceneName != null and sceneName != ''">
|
|
<if test="sceneName != null and sceneName != ''">
|
|
and scene_name like CONCAT('%',#{sceneName,jdbcType=VARCHAR},'%')
|
|
and scene_name like CONCAT('%',#{sceneName,jdbcType=VARCHAR},'%')
|
|
</if>
|
|
</if>
|
|
@@ -403,7 +404,7 @@
|
|
</foreach>
|
|
</foreach>
|
|
</if>
|
|
</if>
|
|
</where>
|
|
</where>
|
|
- order by cc.modify_time,cc.scene_name desc
|
|
|
|
|
|
+ order by cc.create_time,cc.scene_name desc
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="querySceneAccidentListByBqAndQx" parameterType="api.common.pojo.param.scene.SceneAccidentParam"
|
|
<select id="querySceneAccidentListByBqAndQx" parameterType="api.common.pojo.param.scene.SceneAccidentParam"
|