油量接口，字段添加

resources/mapper/modules/airport/OilAnalysisDao.xml

@@ -2,23 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ejweb.modules.airport.dao.OilAnalysisDao">
    <select id="getOilAnalysisData" resultType="com.ejweb.modules.airport.entity.OilAnalysisEntity">
-     select DATE_FORMAT(sta.std, '%Y-%m-%d %H:%i:%S')as std,
+     select DATE_FORMAT(sta.std, '%Y-%m-%d %H:%i')as std,
             sta.flight_no,
             sta.ac_no,
-            sta.dispatcher_name,
+            CONCAT(IFNULL(u.name,''),sta.dispatcher_name) as dispatcher_name,
             sta.total_oil,
             sta.dep_iata_id,
             sta.arr_iata_id,
             sta.extra_oil_fuel_reason,
-            DATE_FORMAT(sta.update_date, '%Y-%m-%d %H:%i:%S')as updateDate,
-            airArr.airport_name as arrAirPortName,
-            airdep.airport_name as depAirPortName,
+            DATE_FORMAT(sta.update_date, '%Y:%m:%d')as updateDate,
+            airArr.city_name as arrAirPortName,
+            airdep.city_name as depAirPortName,
             acType.type_name    as acTypeName
 
      from foc_flight_dynamics_sta sta
-     left join foc_airports airArr on airArr.airport_iata = sta.arr_iata_id
-     left join foc_airports airdep on airdep.airport_iata = sta.dep_iata_id
-     left join foc_ac_type acType  on acType.flight_no = sta.ac_no
+     left join foc_airports airArr  on airArr.airport_iata = sta.arr_iata_id
+     left join foc_airports airdep  on airdep.airport_iata = sta.dep_iata_id
+     left join foc_ac_type  acType  on acType.flight_no = sta.ac_no
+     left join sys_user     u       on u.login_name = sta.dispatcher_name
 
      where 1=1