Commit f36d1c62 by luoh

查询油量分析数据

parent 3633f464
...@@ -39,7 +39,6 @@ public class OilAnalysisController { ...@@ -39,7 +39,6 @@ public class OilAnalysisController {
ResponseBean responseBean = new ResponseBean(); ResponseBean responseBean = new ResponseBean();
OilAnalysisBean bean = requestBean.getObjectBean(OilAnalysisBean.class); OilAnalysisBean bean = requestBean.getObjectBean(OilAnalysisBean.class);
list = oilAnalysisService.getAnalysisData(bean); list = oilAnalysisService.getAnalysisData(bean);
if (list == null)// 查询结果为空 if (list == null)// 查询结果为空
{ {
responseBean.setMessage(GConstants.EMPTY); responseBean.setMessage(GConstants.EMPTY);
...@@ -70,6 +69,7 @@ public class OilAnalysisController { ...@@ -70,6 +69,7 @@ public class OilAnalysisController {
responseBean.setMessage("导出数据失败" + e.getMessage()); responseBean.setMessage("导出数据失败" + e.getMessage());
return responseBean; return responseBean;
} }
return null;
} }
......
...@@ -14,31 +14,31 @@ import com.ejweb.core.utils.excel.annotation.ExcelField; ...@@ -14,31 +14,31 @@ import com.ejweb.core.utils.excel.annotation.ExcelField;
*/ */
public class OilAnalysisEntity { public class OilAnalysisEntity {
@ExcelField(title="序号", type=0, align=1, sort=1 ) @ExcelField(title="序号", type=0, align=1, sort=27 )
private int no; private int no;
@ExcelField(title="计划起飞时间", type=0, align=1, sort=2 ) @ExcelField(title="计划起飞时间", type=0, align=1, sort=28 )
private String std; // 计划起飞时间 private String std; // 计划起飞时间
@ExcelField(title="航班号", type=0, align=1, sort=3 ) @ExcelField(title="航班号", type=0, align=1, sort=29 )
private String flightNo; // 航班号 private String flightNo; // 航班号
@ExcelField(title="飞机号", type=0, align=1, sort=4 ) @ExcelField(title="飞机号", type=0, align=1, sort=30 )
private String acNo; // 飞机号 private String acNo; // 飞机号
@ExcelField(title="机型", type=0, align=1, sort=5 ) @ExcelField(title="机型", type=0, align=1, sort=31 )
private String acTypeName; // 机型 private String acTypeName; // 机型
@ExcelField(title="起飞机场", type=0, align=1, sort=6 ) @ExcelField(title="起飞机场", type=0, align=1, sort=32 )
private String depAirPortName; // 起飞机场中文名称 private String depAirPortName; // 起飞机场中文名称
@ExcelField(title="目的机场", type=0, align=1, sort=7 ) @ExcelField(title="目的机场", type=0, align=1, sort=33 )
private String arrAirPortName; // 落地机场中文名称 private String arrAirPortName; // 落地机场中文名称
@ExcelField(title="签派人", type=0, align=1, sort=8 ) @ExcelField(title="签派人", type=0, align=1, sort=34 )
private String dispatcherName; // 签派人 private String dispatcherName; // 签派人
@ExcelField(title="总油量", type=0, align=1, sort=9 ) @ExcelField(title="总油量", type=0, align=1, sort=35 )
private String totalOil; // 总油量 private String totalOil; // 总油量
@ExcelField(title="起飞额外油量", type=0, align=1, sort=10 ) @ExcelField(title="起飞额外油量", type=0, align=1, sort=36 )
private String extraOilFuelTakeoff; // 起飞额外油量 private String extraOilFuelTakeoff; // 起飞额外油量
@ExcelField(title="到达额外油量", type=0, align=1, sort=11 ) @ExcelField(title="到达额外油量", type=0, align=1, sort=37 )
private String extraOilFuelArr; // 到达额外油量 private String extraOilFuelArr; // 到达额外油量
@ExcelField(title="航路额外油量", type=0, align=1, sort=12 ) @ExcelField(title="航路额外油量", type=0, align=1, sort=38 )
private String extraOilFuelFlight; // 航路额外油量 private String extraOilFuelFlight; // 航路额外油量
@ExcelField(title="起飞额外油量", type=0, align=1, sort=13 ) @ExcelField(title="起飞额外油量", type=0, align=1, sort=39 )
private String extraOilFuelOther; // 起飞额外油量 private String extraOilFuelOther; // 起飞额外油量
private String depIataId; // 起飞机场三字码 private String depIataId; // 起飞机场三字码
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment