修改航线论证导出excel，修改待论证航线导出excel(添加截至反馈时间字段)，修改生成开航指令气泡(原来是正确的，因为没有及时更新代码，被错误覆盖掉)

resources/mapper/modules/airport/StatisticalDao.xml

@@ -15,7 +15,7 @@
         roundtrip_type,
          IFNULL(b.depIata,a.depIata) AS depIata,
         b.arrIata,
-        DATE_FORMAT(a.create_date, '%Y-%m-%d') AS startTime,
+        DATE_FORMAT(a.start_time, '%Y-%m-%d') AS startTime,
         CASE WHEN a.verif_type='01' OR a.verif_type='02' 
              OR a.verif_type='03' OR a.verif_type='04' OR a.verif_type='05'
         THEN p.city_name

src/com/ejweb/modules/route/entity/AirlineVerifyEntity.java

@@ -25,6 +25,7 @@ public class AirlineVerifyEntity {
     private String depName; // 起飞地
     private String depIata; // 起飞地
     private String routeStatus;
+    @ExcelField(title="截止反馈日期", type=0, align=3, sort=19)
     private String nodeDate;//截止时间
     private String arrName; // 目的地
     private String arrIata; // 目的地
@@ -33,7 +34,7 @@ public class AirlineVerifyEntity {
     @ExcelField(title="论证类型", type=0, align=2, sort=17, dictType="vrf_verify_type")  
     private String verifType; 
     @JSONField(name="sailingDate",format="yyyy-MM-dd")
-    @ExcelField(title="开航时间", type=0, align=2, sort=19) 
+    @ExcelField(title="开航时间", type=0, align=2, sort=20)
     private String sailingDate; // 开航时间
     @ExcelField(title="发布时间", type=0, align=2, sort=18) 
     private String createDate; // 创建时间

src/com/ejweb/modules/verify/api/AirlineVerifyController.java

@@ -344,7 +344,7 @@ public class AirlineVerifyController {
             try {
                 ExportExcel  ex= new ExportExcel("航线论证数据", AirlineVerifyEntity.class);
                 List<String> verlist=airLineVerifyService.departNameList("verify");
-               ex.initialize("反馈结论", verlist,9);
+               ex.initialize("反馈结论", verlist,10);
                List<String> risklist=airLineVerifyService.departNameList("risk");
                ex.initialize("风险评估结论", risklist,9+verlist.size());
                 ex.setDataList(list,"verifyList","riskList").write(response, fileName).dispose();

src/com/ejweb/modules/verify/entity/AirlineVerifyEntity.java

@@ -37,17 +37,17 @@ public class AirlineVerifyEntity extends BaseEntity {
 	@ExcelField(title = "机型编号", align = 2, sort = 4)
 	private String aircraftLabel;
 	
-	@ExcelField(title = "论证状态", align = 2, sort = 7, dictType = "vrf_verif_status")
+	@ExcelField(title = "论证状态", align = 2, sort = 6, dictType = "vrf_verif_status")
 	private String verifStatus; // 00论证中,01终止,02成功
 	
-	@ExcelField(title = "论证类型", align = 2, sort = 8, dictType = "vrf_verify_type")
+	@ExcelField(title = "论证类型", align = 2, sort = 7, dictType = "vrf_verify_type")
 	private String verifType; // 论证类型 01 新开-国内 02 新开-国际 03 重开-国内 04 重开-国际 05 备降场
 								// 06 过夜 07训练场
 //	private String flightNo; // 飞机号
-	@ExcelField(title = "开航日期", align = 2, sort = 91)
+	@ExcelField(title = "开航日期", align = 2, sort = 10)
 	private String sailingDate; // 开航时间
 	
-	@ExcelField(title = "发布日期", align = 2, sort = 9)
+	@ExcelField(title = "发布日期", align = 2, sort = 8)
 	private String createDate; // 创建时间
 	
 	@JSONField(serialize = false)
@@ -62,6 +62,7 @@ public class AirlineVerifyEntity extends BaseEntity {
     @JSONField(serialize = false)
     private AirportEntity arrIataAirport;
     private String arrIata;
+    @ExcelField(title="截止反馈日期", align=2, sort=9)
     private String nodeDate;
     private String roundtripType;
     @JSONField(serialize = false)