查询油量分析数据

resources/mapper/modules/airport/OilAnalysisDao.xml

@@ -46,11 +46,11 @@
        </if>
 
        <if test="mintotalOil !=null and mintotalOil!=''">
-           and substring_index(sta.total_oil, 'KGS',1) <![CDATA[>=]]> #{mintotalOil}
+           and substring_index(sta.total_oil,'KGS',1) >= #{mintotalOil}
        </if>
 
        <if test="maxtotalOil !=null and maxtotalOil!=''">
-           and substring_index(sta.total_oil, 'KGS',1)  <![CDATA[<]]> #{maxtotalOil}
+           and substring_index(sta.total_oil,'KGS',1)  <![CDATA[<]]> #{maxtotalOil}
        </if>
 
 

src/com/ejweb/modules/airport/api/OilAnalysisController.java

@@ -33,12 +33,11 @@ public class OilAnalysisController {
     @RequestMapping(value = "/oilAnalysis")
     public ResponseBean getOilAnalysisData(RequestBean requestBean)
     {
-        //todo: 5、生成表格导出
         PageEntity<OilAnalysisEntity> list = null;
-
         ResponseBean responseBean = new ResponseBean();
         OilAnalysisBean bean = requestBean.getObjectBean(OilAnalysisBean.class);
-        list = oilAnalysisService.getAnalysisData(bean);
+        list = oilAnalysisService.getAnalysisData(bean,true);
+
         if (list == null)// 查询结果为空
         {
             responseBean.setMessage(GConstants.EMPTY);
@@ -56,7 +55,7 @@ public class OilAnalysisController {
     public ResponseBean newExport(RequestBean requestBean, HttpServletResponse response) {
         ResponseBean responseBean = new ResponseBean();
         OilAnalysisBean bean = requestBean.getObjectBean(OilAnalysisBean.class);
-        PageEntity<OilAnalysisEntity> page = oilAnalysisService.getAnalysisData(bean);
+        PageEntity<OilAnalysisEntity> page = oilAnalysisService.getAnalysisData(bean,false);
         List<OilAnalysisEntity> list = new ArrayList<OilAnalysisEntity>();
         if (page != null)
         {

src/com/ejweb/modules/airport/bean/OilAnalysisBean.java

@@ -28,9 +28,9 @@ public class OilAnalysisBean extends GenericBean {
     //签派员d
     private String dispatcher;
     //最低总油量
-    private String mintotalOil;
+    private Integer mintotalOil;
     //最高总油量
-    private String maxtotalOil;
+    private Integer maxtotalOil;
 
     @Min(value=1, message="pageNo必须大于等于1")
     private int pageNo=1;//第几页
@@ -75,19 +75,19 @@ public class OilAnalysisBean extends GenericBean {
 
 
 
-    public String getMintotalOil() {
+    public Integer getMintotalOil() {
         return mintotalOil;
     }
 
-    public void setMintotalOil(String mintotalOil) {
+    public void setMintotalOil(Integer mintotalOil) {
         this.mintotalOil = mintotalOil;
     }
 
-    public String getMaxtotalOil() {
+    public Integer getMaxtotalOil() {
         return maxtotalOil;
     }
 
-    public void setMaxtotalOil(String maxtotalOil) {
+    public void setMaxtotalOil(Integer maxtotalOil) {
         this.maxtotalOil = maxtotalOil;
     }
 

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

@@ -34,18 +34,56 @@ public class OilAnalysisEntity {
     private String  totalOil;                 // 总油量
     @ExcelField(title="起飞额外油量", type=0, align=1, sort=36 )
     private String  extraOilFuelTakeoff;      // 起飞额外油量
-    @ExcelField(title="到达额外油量", type=0, align=1, sort=37 )
+    @ExcelField(title="起飞额外油量原因", type=0, align=1, sort=37 )
+    private String  extraOilFuelTakeoffReason;      // 起飞额外油量原因
+    @ExcelField(title="到达额外油量", type=0, align=1, sort=38 )
     private String  extraOilFuelArr;          // 到达额外油量
-    @ExcelField(title="航路额外油量", type=0, align=1, sort=38 )
+    @ExcelField(title="到达额外油量原因", type=0, align=1, sort=39 )
+    private String  extraOilFuelArrReason;          // 到达额外油量原因
+    @ExcelField(title="航路额外油量", type=0, align=1, sort=40 )
     private String  extraOilFuelFlight;       // 航路额外油量
-    @ExcelField(title="起飞额外油量", type=0, align=1, sort=39 )
+    @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 )
+    private String  extraOilFuelOtherReason;        // 起飞额外油量原因
 
     private String  depIataId;                // 起飞机场三字码
     private String  arrIataId;                // 落地机场三字码
     private String  extraOilFuelReason;       // 额外油加注原因
 
+    public String getExtraOilFuelTakeoffReason() {
+        return extraOilFuelTakeoffReason;
+    }
+
+    public void setExtraOilFuelTakeoffReason(String extraOilFuelTakeoffReason) {
+        this.extraOilFuelTakeoffReason = extraOilFuelTakeoffReason;
+    }
+
+    public String getExtraOilFuelArrReason() {
+        return extraOilFuelArrReason;
+    }
+
+    public void setExtraOilFuelArrReason(String extraOilFuelArrReason) {
+        this.extraOilFuelArrReason = extraOilFuelArrReason;
+    }
 
+    public String getExtraOilFuelFlightReason() {
+        return extraOilFuelFlightReason;
+    }
+
+    public void setExtraOilFuelFlightReason(String extraOilFuelFlightReason) {
+        this.extraOilFuelFlightReason = extraOilFuelFlightReason;
+    }
+
+    public String getExtraOilFuelOtherReason() {
+        return extraOilFuelOtherReason;
+    }
+
+    public void setExtraOilFuelOtherReason(String extraOilFuelOtherReason) {
+        this.extraOilFuelOtherReason = extraOilFuelOtherReason;
+    }
 
     public int getNo() {
         return no;

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

@@ -20,16 +20,20 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> {
     @Autowired
     protected OilAnalysisDao oilAnalysisDao;
 
-    public PageEntity <OilAnalysisEntity> getAnalysisData (OilAnalysisBean bean) {
+    public PageEntity <OilAnalysisEntity> getAnalysisData (OilAnalysisBean bean ,Boolean isPage) {
 
-
-        PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
+        if (isPage == true)
+        {
+            PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
+        }
+              
         PageInfo<OilAnalysisEntity> pageInfo = null;
 
         List <OilAnalysisEntity> oilAnalysisEntityList = oilAnalysisDao.getOilAnalysisData(bean);
+
         for (OilAnalysisEntity oilAnalysisEntity : oilAnalysisEntityList)
         {
-            int index=oilAnalysisEntityList.indexOf(oilAnalysisEntity);
+            int index = oilAnalysisEntityList.indexOf(oilAnalysisEntity);
             oilAnalysisEntity.setNo(index);
             String oilFuelReason = oilAnalysisEntity.getExtraOilFuelReason();
             if (!StringUtils.isEmpty(oilFuelReason))
@@ -38,24 +42,52 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> {
                 for (int i = 0;i < arr.length;i++)
                 {
                     String arrTemp = arr[i];
+
+                    String oilNum = "";
+                    String oilReason = "";
                     String[] reasonArr = arrTemp.split(":");
-                    String oilNum = reasonArr.length==0 ? "":reasonArr[0] ;
+                    if (arrTemp.indexOf(":") > 1)
+                    {
+                        if (reasonArr.length == 1)
+                        {
+                           //只有前面
+                            oilNum = reasonArr[0];
+                            oilReason = "";
+
+                        }else if (reasonArr.length == 2){
+                           //前后都有
+                            oilNum = reasonArr[0];
+                            oilReason = reasonArr[1];
+                        }
+                    }else {
+                        if (reasonArr.length == 1)
+                        {
+                            //只有后面
+                            oilNum = "";
+                            oilReason = reasonArr[1];
+                        }
+                    }
+
                     switch (i){
                         case 0 :
                             //起飞油量及原因
                             oilAnalysisEntity.setExtraOilFuelTakeoff(oilNum);
+                            oilAnalysisEntity.setExtraOilFuelTakeoffReason(oilFuelReason);
                             break;
                         case 1 :
                             //到达额外油量及原因
                             oilAnalysisEntity.setExtraOilFuelArr(oilNum);
+                            oilAnalysisEntity.setExtraOilFuelArrReason(oilReason);
                             break;
                         case 2 :
                             //航路额外油量及原因
                             oilAnalysisEntity.setExtraOilFuelFlight(oilNum);
+                            oilAnalysisEntity.setExtraOilFuelFlightReason(oilReason);
                             break;
                         case 3 :
                             //其他额外油量及原因
                             oilAnalysisEntity.setExtraOilFuelOther(oilNum);
+                            oilAnalysisEntity.setExtraOilFuelOtherReason(oilReason);
                             break;
                         default :
                     }