wuhonghao пре 4 година
родитељ
комит
d42d28b009

+ 11 - 16
railway-business/src/main/resources/mapper/catenary/BusJcbFdfxjyqMapper.xml

@@ -473,7 +473,7 @@
     SELECT
     a.id,
     a.fdfxjyq_id,
-    c.station_name,
+    v.station_name,
     a.pillar_code,
     a.fdh,
     a.temperature,
@@ -521,13 +521,10 @@
     a.sdgjczt_sddg,
     a.sdgjczt_sddg_desc
     FROM
-    bus_jcb_fdfxjyq a,
-    base_fdfxjyq b,
-    base_station c
-    where
-    a.fdfxjyq_id = b.id
-    AND b.station_id = c.station_id
-    and a.del_flag='0' and b.del_flag='0' and b.del_flag='0' and a.id = #{id}
+    bus_jcb_fdfxjyq a
+    left join base_fdfxjyq b on a.fdfxjyq_id = b.id
+    LEFT JOIN v_station v on t.station_id = v.dept_station_id
+    where a.del_flag='0' and b.del_flag='0' and b.del_flag='0' and a.id = #{id}
 
   </select>
 
@@ -535,7 +532,7 @@
     SELECT
     a.id,
     a.fdfxjyq_id,
-    c.station_name,
+    v.station_name,
     a.pillar_code,
     a.fdh,
     a.temperature,
@@ -583,18 +580,16 @@
     a.sdgjczt_sddg,
     a.sdgjczt_sddg_desc
     FROM
-    bus_jcb_fdfxjyq a,
-    base_fdfxjyq b,
-    base_station c
+    bus_jcb_fdfxjyq a
+    left join base_fdfxjyq b on a.fdfxjyq_id = b.id
+    LEFT JOIN v_station v on t.station_id = v.dept_station_id
     <where>
-      a.fdfxjyq_id = b.id
-      AND b.station_id = c.station_id
-      and a.del_flag='0' and b.del_flag='0' and b.del_flag='0'
+      and a.del_flag='0' and b.del_flag='0'
       <if test="fdfxjyqId!=null and fdfxjyqId!=''">
         and a.fdfxjyq_id=#{fdfxjyqId}
       </if>
       <if test="stationId!=null and stationId!=''">
-        and a.station_id=#{stationId}
+        and v.station_id=#{stationId}
       </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and a.pillar_code=#{pillarCode}