|
@@ -205,13 +205,13 @@
|
|
|
v.dept_id, v.dept_name,
|
|
v.dept_id, v.dept_name,
|
|
|
v.line_id, v.line_name,
|
|
v.line_id, v.line_name,
|
|
|
v.station_name, v.station_id,
|
|
v.station_name, v.station_id,
|
|
|
- a.*
|
|
|
|
|
|
|
+ t.*
|
|
|
FROM bus_jceb_lbjghjl a
|
|
FROM bus_jceb_lbjghjl a
|
|
|
- LEFT JOIN v_station v ON a.dept_station_id = v.dept_station_id
|
|
|
|
|
|
|
+ LEFT JOIN v_station v ON t.dept_station_id = v.dept_station_id
|
|
|
WHERE
|
|
WHERE
|
|
|
- a.del_flag = '0'
|
|
|
|
|
|
|
+ t.del_flag = '0'
|
|
|
AND s.del_flag = '0'
|
|
AND s.del_flag = '0'
|
|
|
- AND a.id = #{id}
|
|
|
|
|
|
|
+ AND t.id = #{id}
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="getList" resultMap="BaseResultMap">
|
|
<select id="getList" resultMap="BaseResultMap">
|
|
@@ -219,68 +219,68 @@
|
|
|
v.dept_id, v.dept_name,
|
|
v.dept_id, v.dept_name,
|
|
|
v.line_id, v.line_name,
|
|
v.line_id, v.line_name,
|
|
|
v.station_name, v.station_id,
|
|
v.station_name, v.station_id,
|
|
|
- a.*
|
|
|
|
|
|
|
+ t.*
|
|
|
FROM bus_jceb_lbjghjl a
|
|
FROM bus_jceb_lbjghjl a
|
|
|
- LEFT JOIN v_station v ON a.dept_station_id = v.dept_station_id
|
|
|
|
|
|
|
+ LEFT JOIN v_station v ON t.dept_station_id = v.dept_station_id
|
|
|
<where>
|
|
<where>
|
|
|
- a.del_flag = '0'
|
|
|
|
|
|
|
+ t.del_flag = '0'
|
|
|
<if test="stationId!=null and stationId!=''">
|
|
<if test="stationId!=null and stationId!=''">
|
|
|
and v.station_id=#{stationId}
|
|
and v.station_id=#{stationId}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="dd!=null and dd!=''">
|
|
<if test="dd!=null and dd!=''">
|
|
|
- and a.dd=#{dd}
|
|
|
|
|
|
|
+ and t.dd=#{dd}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="ghqMc!=null and ghqMc!=''">
|
|
<if test="ghqMc!=null and ghqMc!=''">
|
|
|
- and a.ghq_mc=#{ghqMc}
|
|
|
|
|
|
|
+ and t.ghq_mc=#{ghqMc}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="ghqGgxh!=null and ghqGgxh!=''">
|
|
<if test="ghqGgxh!=null and ghqGgxh!=''">
|
|
|
- and a.ghq_ggxh=#{ghqGgxh}
|
|
|
|
|
|
|
+ and t.ghq_ggxh=#{ghqGgxh}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="ghqSccj!=null and ghqSccj!=''">
|
|
<if test="ghqSccj!=null and ghqSccj!=''">
|
|
|
- and a.ghq_sccj=#{ghqSccj}
|
|
|
|
|
|
|
+ and t.ghq_sccj=#{ghqSccj}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="ghhMc!=null and ghhMc!=''">
|
|
<if test="ghhMc!=null and ghhMc!=''">
|
|
|
- and a.ghh_mc=#{ghhMc}
|
|
|
|
|
|
|
+ and t.ghh_mc=#{ghhMc}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="ghhGgxh!=null and ghhGgxh!=''">
|
|
<if test="ghhGgxh!=null and ghhGgxh!=''">
|
|
|
- and a.ghh_ggxh=#{ghhGgxh}
|
|
|
|
|
|
|
+ and t.ghh_ggxh=#{ghhGgxh}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="ghhSccj!=null and ghhSccj!=''">
|
|
<if test="ghhSccj!=null and ghhSccj!=''">
|
|
|
- and a.ghh_sccj=#{ghhSccj}
|
|
|
|
|
|
|
+ and t.ghh_sccj=#{ghhSccj}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="ghyy!=null and ghyy!=''">
|
|
<if test="ghyy!=null and ghyy!=''">
|
|
|
- and a.ghyy=#{ghyy}
|
|
|
|
|
|
|
+ and t.ghyy=#{ghyy}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="operationDate!=null and operationDate!=''">
|
|
<if test="operationDate!=null and operationDate!=''">
|
|
|
- and a.operation_date=#{operationDate}
|
|
|
|
|
|
|
+ and t.operation_date=#{operationDate}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="operator!=null and operator!=''">
|
|
<if test="operator!=null and operator!=''">
|
|
|
- and a.operator=#{operator}
|
|
|
|
|
|
|
+ and t.operator=#{operator}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="remark!=null and remark!=''">
|
|
<if test="remark!=null and remark!=''">
|
|
|
- and a.remark=#{remark}
|
|
|
|
|
|
|
+ and t.remark=#{remark}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="submitState!=null and submitState!=''">
|
|
<if test="submitState!=null and submitState!=''">
|
|
|
- and a.submit_state <![CDATA[ >= ]]> #{submitState}
|
|
|
|
|
|
|
+ and t.submit_state <![CDATA[ >= ]]> #{submitState}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="delFlag!=null and delFlag!=''">
|
|
<if test="delFlag!=null and delFlag!=''">
|
|
|
- and a.del_flag=#{delFlag}
|
|
|
|
|
|
|
+ and t.del_flag=#{delFlag}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="createBy!=null and createBy!=''">
|
|
<if test="createBy!=null and createBy!=''">
|
|
|
- and a.create_by=#{createBy}
|
|
|
|
|
|
|
+ and t.create_by=#{createBy}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="createTime!=null and createTime!=''">
|
|
<if test="createTime!=null and createTime!=''">
|
|
|
- and a.create_time=#{createTime}
|
|
|
|
|
|
|
+ and t.create_time=#{createTime}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="updateBy!=null and updateBy!=''">
|
|
<if test="updateBy!=null and updateBy!=''">
|
|
|
- and a.update_by=#{updateBy}
|
|
|
|
|
|
|
+ and t.update_by=#{updateBy}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="updateTime!=null and updateTime!=''">
|
|
<if test="updateTime!=null and updateTime!=''">
|
|
|
- and a.update_time=#{updateTime}
|
|
|
|
|
|
|
+ and t.update_time=#{updateTime}
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
<if test="orderBy!=null and orderBy!=''">
|
|
<if test="orderBy!=null and orderBy!=''">
|
|
|
- order by a.${orderBy}
|
|
|
|
|
|
|
+ order by t.${orderBy}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="isAsc!=null and isAsc!=''">
|
|
<if test="isAsc!=null and isAsc!=''">
|
|
|
<if test="isAsc == '1'.toString()">
|
|
<if test="isAsc == '1'.toString()">
|
|
@@ -341,6 +341,9 @@
|
|
|
<if test="operator!=null and operator!=''">
|
|
<if test="operator!=null and operator!=''">
|
|
|
and t.operator=#{operator}
|
|
and t.operator=#{operator}
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="createBy!=null and createBy!=''">
|
|
|
|
|
+ and t.create_by=#{createBy}
|
|
|
|
|
+ </if>
|
|
|
</where>
|
|
</where>
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|