油量分析导出添加四字码

resources/mapper/modules/airport/OilAnalysisDao.xml

@@ -16,6 +16,8 @@
         DATE_FORMAT(sta.update_time, '%Y/%m/%d %H:%i:%s')as updateTime,
         airArr.city_name as arrAirPortName,
         airdep.city_name as depAirPortName,
+        airArr.airport_icao as arrIcaoId,
+        airdep.airport_icao as depIcaoId,
         IFNULL(fat.verify_ac_type,'') as acTypeName
 
         from foc_flight_dynamics_sta sta

src/com/ejweb/modules/airport/entity/OilAnalysisEntity.java

@@ -32,47 +32,51 @@ public class OilAnalysisEntity {
     private String  depAirPortName;           // 起飞机场中文名称
     @ExcelField(title="起飞机场三字码", type=0, align=1, sort=33 )
     private String  depIataId;                // 起飞机场三字码
+    @ExcelField(title="起飞机场四字码", type=0, align=1, sort=34 )
+    private String  depIcaoId;                // 起飞机场四字码
 
 
-    @ExcelField(title="目的机场", type=0, align=1, sort=34 )
+    @ExcelField(title="目的机场", type=0, align=1, sort=35 )
     private String  arrAirPortName;           // 落地机场中文名称
-    @ExcelField(title="目的机场三字码", type=0, align=1, sort=35 )
+    @ExcelField(title="目的机场三字码", type=0, align=1, sort=36 )
     private String  arrIataId;                // 落地机场三字码
+    @ExcelField(title="目的机场四字码", type=0, align=1, sort=37 )
+    private String  arrIcaoId;                // 落地机场四字码
 
-    @ExcelField(title="签派人姓名", type=0, align=1, sort=36 )
+    @ExcelField(title="签派人姓名", type=0, align=1, sort=38 )
     private String  dispatcherAccount;           // 签派人账号
 
-    @ExcelField(title="签派人账号", type=0, align=1, sort=37 )
+    @ExcelField(title="签派人账号", type=0, align=1, sort=39 )
     private String  dispatcherName;           // 签派人
 
 
 
-    @ExcelField(title="总油量(KGS)", type=0, align=1, sort=38 )
+    @ExcelField(title="总油量(KGS)", type=0, align=1, sort=40 )
     private Integer  totalOilKGS;                 // 总油量
 
-    @ExcelField(title="总油量(LBS)", type=0, align=1, sort=39 )
+    @ExcelField(title="总油量(LBS)", type=0, align=1, sort=41 )
     private Integer  totalOilLBS;                 // 总油量
 
 
 
-    @ExcelField(title="起飞额外油量", type=0, align=1, sort=40 )
+    @ExcelField(title="起飞额外油量", type=0, align=1, sort=42 )
     private Integer  extraOilFuelTakeoff;      // 起飞额外油量
-    @ExcelField(title="起飞额外油量原因", type=0, align=1, sort=41 )
+    @ExcelField(title="起飞额外油量原因", type=0, align=1, sort=43 )
     private String  extraOilFuelTakeoffReason;      // 起飞额外油量原因
-    @ExcelField(title="到达额外油量", type=0, align=1, sort=42 )
+    @ExcelField(title="到达额外油量", type=0, align=1, sort=44 )
     private Integer  extraOilFuelArr;          // 到达额外油量
-    @ExcelField(title="到达额外油量原因", type=0, align=1, sort=43 )
+    @ExcelField(title="到达额外油量原因", type=0, align=1, sort=45 )
     private String  extraOilFuelArrReason;          // 到达额外油量原因
-    @ExcelField(title="航路额外油量", type=0, align=1, sort=44 )
+    @ExcelField(title="航路额外油量", type=0, align=1, sort=46 )
     private Integer  extraOilFuelFlight;       // 航路额外油量
-    @ExcelField(title="航路额外油量原因", type=0, align=1, sort=45)
+    @ExcelField(title="航路额外油量原因", type=0, align=1, sort=47)
     private String  extraOilFuelFlightReason;       // 航路额外油量原因
-    @ExcelField(title="其他额外油量", type=0, align=1, sort=46 )
+    @ExcelField(title="其他额外油量", type=0, align=1, sort=48 )
     private Integer  extraOilFuelOther;        // 其他额外油量
-    @ExcelField(title="其他额外油量原因", type=0, align=1, sort=47 )
+    @ExcelField(title="其他额外油量原因", type=0, align=1, sort=49 )
     private String  extraOilFuelOtherReason;        // 起飞额外油量原因
 
-    @ExcelField(title="数据更新时间", type=0, align=1, sort=48 )
+    @ExcelField(title="数据更新时间", type=0, align=1, sort=50 )
     private String  updateTime;        // 数据更新时间
 
     private String  updateDate;        // 数据更新时间
@@ -80,6 +84,22 @@ public class OilAnalysisEntity {
     private String  totalOil;                 // 总油量
     private String  std;                      // 计划起飞时间
 
+    public String getDepIcaoId() {
+        return depIcaoId;
+    }
+
+    public void setDepIcaoId(String depIcaoId) {
+        this.depIcaoId = depIcaoId;
+    }
+
+    public String getArrIcaoId() {
+        return arrIcaoId;
+    }
+
+    public void setArrIcaoId(String arrIcaoId) {
+        this.arrIcaoId = arrIcaoId;
+    }
+
 
     public String getUpdateTime() {
         return updateTime;