update

resources/mapper/modules/airport/OilAnalysisDao.xml

@@ -10,6 +10,7 @@
             sta.dep_iata_id,
             sta.arr_iata_id,
             sta.extra_oil_fuel_reason,
+            sta.update_date,
             airArr.airport_name as arrAirPortName,
             airdep.airport_name as depAirPortName,
             acType.type_name    as acTypeName

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

@@ -44,10 +44,12 @@ public class OilAnalysisEntity {
     private String  extraOilFuelFlight;       // 航路额外油量
     @ExcelField(title="航路额外油量原因", type=0, align=1, sort=41 )
     private String  extraOilFuelFlightReason;       // 航路额外油量原因
-    @ExcelField(title="起飞额外油量", type=0, align=1, sort=42 )
-    private String  extraOilFuelOther;        // 起飞额外油量
-    @ExcelField(title="起飞额外油量", type=0, align=1, sort=43 )
+    @ExcelField(title="其他额外油量", type=0, align=1, sort=42 )
+    private String  extraOilFuelOther;        // 其他额外油量
+    @ExcelField(title="其他额外油量原因", type=0, align=1, sort=43 )
     private String  extraOilFuelOtherReason;        // 起飞额外油量原因
+    @ExcelField(title="数据更新时间", type=0, align=1, sort=44 )
+    private String  updateDate;        // 数据更新时间
 
     private String  depIataId;                // 起飞机场三字码
     private String  arrIataId;                // 落地机场三字码
@@ -212,4 +214,13 @@ public class OilAnalysisEntity {
     public void setArrAirPortName(String arrAirPortName) {
         this.arrAirPortName = arrAirPortName;
     }
+
+
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
 }

src/com/ejweb/modules/airport/service/OilAnalysisService.java

@@ -34,7 +34,7 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> {
         for (OilAnalysisEntity oilAnalysisEntity : oilAnalysisEntityList)
         {
             int index = oilAnalysisEntityList.indexOf(oilAnalysisEntity);
-            oilAnalysisEntity.setNo(index);
+            oilAnalysisEntity.setNo(index+1);
             String oilFuelReason = oilAnalysisEntity.getExtraOilFuelReason();
             if (!StringUtils.isEmpty(oilFuelReason))
             {
@@ -72,7 +72,7 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> {
                         case 0 :
                             //起飞油量及原因
                             oilAnalysisEntity.setExtraOilFuelTakeoff(oilNum);
-                            oilAnalysisEntity.setExtraOilFuelTakeoffReason(oilFuelReason);
+                            oilAnalysisEntity.setExtraOilFuelTakeoffReason(oilReason);
                             break;
                         case 1 :
                             //到达额外油量及原因