dxfBUG修改

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

@@ -60,15 +60,12 @@
   </resultMap>
 
   <sql id="Base_Column_List">
-    id,
+    t.id,
     t.fdfxjyq_id,
-    v.dept_id,
-    v.dept_name,
-    v.station_name as station_name,
-    v.station_id,
-    t.dept_station_id,
-    t.pillar_code,
-    t.fdh,
+    b.dept_station_id station_id,
+    v.station_name,
+    b.pillar_area pillar_code,
+    b.dch fdh,
     t.temperature,
     t.check_date,
     t.pic_url,
@@ -473,56 +470,7 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    t.id,
-    t.fdfxjyq_id,
-    b.dept_station_id station_id,
-    v.station_name,
-    b.pillar_code,
-    b.dch fdh,
-    t.temperature,
-    t.check_date,
-    t.pic_url,
-    t.point_a,
-    t.point_b,
-    t.point_c,
-    t.point_d,
-    t.point_e,
-    t.point_f,
-    t.point_g,
-    t.point_h,
-    t.fcd,
-    t.fddmpsd,
-    t.jybj_fdjyqzjyzt,
-    t.jybj_fdjyqzjyzt_desc,
-    t.jybj_clsjyzzt,
-    t.jybj_clsjyzzt_desc,
-    t.lbjzt_ls,
-    t.lbjzt_ls_desc,
-    t.lbjzt_xdx,
-    t.lbjzt_xdx_desc,
-    t.lbjzt_phzj,
-    t.lbjzt_phzj_desc,
-    t.lbjzt_jcxjt,
-    t.lbjzt_jcxjt_desc,
-    t.lbjzt_xhj,
-    t.lbjzt_xhj_desc,
-    t.sbzt,
-    t.sbzt_desc,
-    t.check_user,
-    t.confirm_user,
-    t.czwt,
-    t.create_by,
-    t.create_time,
-    t.update_by,
-    t.update_time,
-    t.submit_state,
-    t.del_flag,
-    t.xlfd_xlpd,
-    t.xlfd_wgdg,
-    t.xlfd_fdsxlqj,
-    t.xlfd_fdczxlqj,
-    t.sdgjczt_sddg,
-    t.sdgjczt_sddg_desc
+    <include refid="Base_Column_List"></include>
     FROM
     bus_jcb_fdfxjyq t
     left join base_fdfxjyq b on t.fdfxjyq_id = b.id
@@ -533,56 +481,7 @@
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    t.id,
-    t.fdfxjyq_id,
-    b.dept_station_id station_id,
-    v.station_name,
-    b.pillar_code,
-    b.dch fdh,
-    t.temperature,
-    t.check_date,
-    t.pic_url,
-    t.point_a,
-    t.point_b,
-    t.point_c,
-    t.point_d,
-    t.point_e,
-    t.point_f,
-    t.point_g,
-    t.point_h,
-    t.fcd,
-    t.fddmpsd,
-    t.jybj_fdjyqzjyzt,
-    t.jybj_fdjyqzjyzt_desc,
-    t.jybj_clsjyzzt,
-    t.jybj_clsjyzzt_desc,
-    t.lbjzt_ls,
-    t.lbjzt_ls_desc,
-    t.lbjzt_xdx,
-    t.lbjzt_xdx_desc,
-    t.lbjzt_phzj,
-    t.lbjzt_phzj_desc,
-    t.lbjzt_jcxjt,
-    t.lbjzt_jcxjt_desc,
-    t.lbjzt_xhj,
-    t.lbjzt_xhj_desc,
-    t.sbzt,
-    t.sbzt_desc,
-    t.check_user,
-    t.confirm_user,
-    t.czwt,
-    t.create_by,
-    t.create_time,
-    t.update_by,
-    t.update_time,
-    t.submit_state,
-    t.del_flag,
-    t.xlfd_xlpd,
-    t.xlfd_wgdg,
-    t.xlfd_fdsxlqj,
-    t.xlfd_fdczxlqj,
-    t.sdgjczt_sddg,
-    t.sdgjczt_sddg_desc
+    <include refid="Base_Column_List"></include>
     FROM
     bus_jcb_fdfxjyq t
     left join base_fdfxjyq b on t.fdfxjyq_id = b.id
@@ -749,11 +648,13 @@
 
   <select id="getLastOne" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
-    FROM bus_jcb_fdfxjyq t
-    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
-    WHERE
-    t.submit_state = '1'and t.del_flag = '0'
+    <include refid="Base_Column_List"></include>
+    FROM
+    bus_jcb_fdfxjyq t
+    left join base_fdfxjyq b on t.fdfxjyq_id = b.id
+    LEFT JOIN v_station v on b.dept_station_id = v.dept_station_id
+    where t.del_flag='0' and b.del_flag='0' and b.del_flag='0'
+    and t.submit_state = '1'and t.del_flag = '0'
     <if test="stationId!=null and stationId!=''">
       and v.station_id=#{stationId}
     </if>