Commit 3633f464 by luoh

查询油量分析数据

parent 5842a65c
......@@ -63,9 +63,7 @@ public class OilAnalysisController {
{
list = page.getList();
//自定义导出序号
int no = 1;
String fileName = "油量分析统计.xlsx";
try {
new ExportExcel("油量分析统计", OilAnalysisEntity.class).setDataList(list).write(response, fileName).dispose();
} catch (IOException e) {
......
......@@ -14,23 +14,37 @@ import com.ejweb.core.utils.excel.annotation.ExcelField;
*/
public class OilAnalysisEntity {
@ExcelField(title="序号", type=0, align=1, sort=1 )
private int no;
@ExcelField(title="计划起飞时间", type=0, align=1, sort=2 )
private String std; // 计划起飞时间
@ExcelField(title="航班号", type=0, align=1, sort=3 )
private String flightNo; // 航班号
@ExcelField(title="飞机号", type=0, align=1, sort=4 )
private String acNo; // 飞机号
private String depIataId; // 起飞机场三字码
private String arrIataId; // 落地机场三字码
@ExcelField(title="机型", type=0, align=1, sort=5 )
private String acTypeName; // 机型
@ExcelField(title="起飞机场", type=0, align=1, sort=6 )
private String depAirPortName; // 起飞机场中文名称
@ExcelField(title="目的机场", type=0, align=1, sort=7 )
private String arrAirPortName; // 落地机场中文名称
@ExcelField(title="签派人", type=0, align=1, sort=8 )
private String dispatcherName; // 签派人
private String totalOil; // 总油量
private String extraOilFuelReason; // 额外油加注原因
@ExcelField(title="总油量", type=0, align=1, sort=9 )
private String totalOil; // 总油量
@ExcelField(title="起飞额外油量", type=0, align=1, sort=10 )
private String extraOilFuelTakeoff; // 起飞额外油量
@ExcelField(title="到达额外油量", type=0, align=1, sort=11 )
private String extraOilFuelArr; // 到达额外油量
@ExcelField(title="航路额外油量", type=0, align=1, sort=12 )
private String extraOilFuelFlight; // 航路额外油量
@ExcelField(title="起飞额外油量", type=0, align=1, sort=13 )
private String extraOilFuelOther; // 起飞额外油量
private String depAirPortName; // 起飞机场中文名称
private String arrAirPortName; // 落地机场中文名称
private String acTypeName; // 机型
@ExcelField(title="序号", type=0, align=1, sort=19 )
private int no;
private String depIataId; // 起飞机场三字码
private String arrIataId; // 落地机场三字码
private String extraOilFuelReason; // 额外油加注原因
public int getNo() {
......@@ -41,8 +55,6 @@ public class OilAnalysisEntity {
this.no = no;
}
public String getAcTypeName() {
return acTypeName;
}
......
......@@ -29,6 +29,8 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> {
List <OilAnalysisEntity> oilAnalysisEntityList = oilAnalysisDao.getOilAnalysisData(bean);
for (OilAnalysisEntity oilAnalysisEntity : oilAnalysisEntityList)
{
int index=oilAnalysisEntityList.indexOf(oilAnalysisEntity);
oilAnalysisEntity.setNo(index);
String oilFuelReason = oilAnalysisEntity.getExtraOilFuelReason();
if (!StringUtils.isEmpty(oilFuelReason))
{
......
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