修改油量分析列表sql

resources/mapper/modules/airport/OilAnalysisDao.xml

@@ -16,16 +16,17 @@
        DATE_FORMAT(sta.update_time, '%Y/%m/%d %H:%i:%s')as updateTime,
        airArr.city_name as arrAirPortName,
        airdep.city_name as depAirPortName,
-            IFNULL(acType.type_name,'') as acTypeName
+       IFNULL(ac.verify_ac_type,'') 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_flight_dynamics fd on DATE_FORMAT(fd.std_chn, '%Y-%m-%d')=DATE_FORMAT(sta.std, '%Y-%m-%d') and
+       fd.flight_no=sta.flight_no
+       left join foc_ac_type_compare ac on ac.ac_type = fd.ac_type
        left join sys_user u on u.login_name = sta.dispatcher_name
 
 
-
        where 1=1
 
        <if test="arrIata!=null and arrIata!='' ">
@@ -64,8 +65,8 @@
            and substring_index(sta.total_oil,'KGS',1)  <![CDATA[<]]> #{maxtotalOil}
        </if>
 
-       order by std    desc
-
+       group by sta.std,sta.flight_no
+       order by sta.std desc
    </select>
 
 </mapper>
\ No newline at end of file